x/vmware-nsx
Code Issues Proposed changes

Merge "NSXv: update static routes in LBaaS loadbalancer"

Browse Source
This commit is contained in:
Zuul 2017-12-21 16:23:20 +00:00 committed by Gerrit Code Review
commit 8656c614ea
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmware_nsx/services/lbaas/nsx_v/lbaas_common.py
View File

@ -124,8 +124,11 @@ def get_lbaas_edge_id(context, plugin, lb_id, vip_addr, subnet_id, tenant_id,
vip_addr=vip_addr, subnet=subnet) vip_addr=vip_addr, subnet=subnet)
gw_ip = subnet.get('gateway_ip') gw_ip = subnet.get('gateway_ip')
if gw_ip: if gw_ip or subnet['host_routes']:
plugin.nsx_v.update_routes(edge_id, gw_ip, []) routes = [{'cidr': r['destination'],
'nexthop': r['nexthop']} for r in
subnet['host_routes']]
plugin.nsx_v.update_routes(edge_id, gw_ip, routes)
return edge_id return edge_id

23
vmware_nsx/services/lbaas/nsx_v/v2/loadbalancer_mgr.py
View File

@ -184,8 +184,10 @@ class EdgeLoadBalancerManager(base_mgr.EdgeLoadbalancerBaseManager):
context = kwargs.get('context') context = kwargs.get('context')
orig = kwargs['original_subnet'] orig = kwargs['original_subnet']
updated = kwargs['subnet'] updated = kwargs['subnet']
if orig['gateway_ip'] == updated['gateway_ip']: if (orig['gateway_ip'] == updated['gateway_ip'] and
self._routes_equal(orig['host_routes'], updated['host_routes'])):
return return
subnet_id = updated['id'] subnet_id = updated['id']
subnet = self.core_plugin.get_subnet(context.elevated(), subnet_id) subnet = self.core_plugin.get_subnet(context.elevated(), subnet_id)
@ -201,5 +203,22 @@ class EdgeLoadBalancerManager(base_mgr.EdgeLoadbalancerBaseManager):
context.session, lb_port['device_id']) context.session, lb_port['device_id'])
edge_id = edge_bind['edge_id'] edge_id = edge_bind['edge_id']
routes = [{'cidr': r['destination'],
'nexthop': r['nexthop']} for r in
subnet['host_routes']]
self.core_plugin.nsx_v.update_routes( self.core_plugin.nsx_v.update_routes(
edge_id, subnet['gateway_ip'], []) edge_id, subnet['gateway_ip'], routes)
def _routes_equal(self, a, b):
if len(a) != len(b):
return False
for a_item in a:
found = False
for b_item in b:
# compare values as keysets should be same
if set(a_item.values()) == set(b_item.values()):
found = True
if not found:
return False
return True