Merge "Updating Jinja config and loadbalancerdbv2"

This commit is contained in:
Jenkins 2015-02-05 08:15:11 +00:00 committed by Gerrit Code Review
commit 884f0261c9
4 changed files with 14 additions and 11 deletions

View File

@ -281,6 +281,7 @@ class LoadBalancerPluginDbv2(base_db.CommonDbMixin):
raise loadbalancerv2.LoadBalancerListenerProtocolPortExists(
lb_id=listener['loadbalancer_id'],
protocol_port=listener['protocol_port'])
context.session.refresh(listener_db_entry.loadbalancer)
return data_models.Listener.from_sqlalchemy_model(listener_db_entry)
def update_listener(self, context, id, listener):
@ -428,6 +429,7 @@ class LoadBalancerPluginDbv2(base_db.CommonDbMixin):
raise loadbalancerv2.MemberExists(address=member['address'],
port=member['protocol_port'],
pool=pool_id)
context.session.refresh(member_db.pool)
return data_models.Member.from_sqlalchemy_model(member_db)
def update_pool_member(self, context, id, member):

View File

@ -125,7 +125,7 @@ def _transform_pool(pool):
'health_monitor': '',
'session_persistence': '',
'admin_state_up': pool.admin_state_up,
'status': pool.status
'provisioning_status': pool.provisioning_status
}
members = [_transform_member(x)
for x in pool.members if _include_member(x)]
@ -154,7 +154,7 @@ def _transform_member(member):
'weight': member.weight,
'admin_state_up': member.admin_state_up,
'subnet_id': member.subnet_id,
'status': member.status
'provisioning_status': member.provisioning_status
}
@ -174,7 +174,8 @@ def _transform_health_monitor(monitor):
def _include_member(member):
return member.status in MEMBER_STATUSES and member.admin_state_up
return (member.provisioning_status in
MEMBER_STATUSES and member.admin_state_up)
def _expand_expected_codes(codes):

View File

@ -71,4 +71,4 @@ backend {{ pool.id }}
{% endif %}
{{ "server %s %s:%d weight %s%s%s"|e|format(member.id, member.address, member.protocol_port, member.weight, hm_opt, persistence_opt)|trim() }}
{% endfor %}
{% endmacro %}
{% endmacro %}

View File

@ -37,7 +37,7 @@ RET_MEMBER_1 = {
'weight': 13,
'subnet_id': '10.0.0.1/24',
'admin_state_up': 'true',
'status': 'ACTIVE'}
'provisioning_status': 'ACTIVE'}
RET_MEMBER_2 = {
'id': 'sample_member_id_2',
@ -46,7 +46,7 @@ RET_MEMBER_2 = {
'weight': 13,
'subnet_id': '10.0.0.1/24',
'admin_state_up': 'true',
'status': 'ACTIVE'}
'provisioning_status': 'ACTIVE'}
RET_POOL = {
'id': 'sample_pool_id_1',
@ -56,7 +56,7 @@ RET_POOL = {
'health_monitor': RET_MONITOR,
'session_persistence': RET_PERSISTENCE,
'admin_state_up': 'true',
'status': 'ACTIVE'}
'provisioning_status': 'ACTIVE'}
RET_LISTENER = {
'id': 'sample_listener_id_1',
@ -118,7 +118,7 @@ def sample_pool_tuple(proto=None, monitor=True, persistence=True,
proto = 'HTTP' if proto is None else proto
in_pool = collections.namedtuple(
'pool', 'id, protocol, lb_algorithm, members, healthmonitor,'
'sessionpersistence, admin_state_up, status')
'sessionpersistence, admin_state_up, provisioning_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
@ -131,14 +131,14 @@ def sample_pool_tuple(proto=None, monitor=True, persistence=True,
healthmonitor=mon,
sessionpersistence=persis,
admin_state_up='true',
status='ACTIVE')
provisioning_status='ACTIVE')
def sample_member_tuple(id, ip):
in_member = collections.namedtuple('member',
'id, address, protocol_port, '
'weight, subnet_id, '
'admin_state_up, status')
'admin_state_up, provisioning_status')
return in_member(
id=id,
address=ip,
@ -146,7 +146,7 @@ def sample_member_tuple(id, ip):
weight=13,
subnet_id='10.0.0.1/24',
admin_state_up='true',
status='ACTIVE')
provisioning_status='ACTIVE')
def sample_session_persistence_tuple(persistence_type=None):