x/vmware-nsx
Code Issues Proposed changes

NSX|v: handle old loadbalancers interfaces

Browse Source 
When adding/deleting a pool member to a loadbalancer that is attached
to an exclusive router (created before there was a dedicated load balancer
edge), the edge resource id is not lbaas-xxx but the id of the router.

Change-Id: Iae030008e85f032751761e5f59448b9af8b8fe80
This commit is contained in:
Adit Sarfaty 2017-07-05 14:11:14 +03:00
parent bb0adcaf0b
commit a83bc6c043
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ from neutron_lib import exceptions as n_exc
from vmware_nsx._i18n import _
from vmware_nsx.common import locking
from vmware_nsx.db import nsxv_db
from vmware_nsx.plugins.nsx_v.vshield import edge_utils
MEMBER_ID_PFX = 'member-'
@ -33,6 +34,22 @@ def get_lb_resource_id(lb_id):
return ('lbaas-' + lb_id)[:36]
def get_lb_edge_name(context, lb_id):
"""Look for the resource name of the edge hosting the LB.
For older loadbalancers this may be a router edge
"""
binding = nsxv_db.get_nsxv_lbaas_loadbalancer_binding(
context.session, lb_id)
if binding:
edge_binding = nsxv_db.get_nsxv_router_binding_by_edge(
context.session, binding['edge_id'])
if edge_binding:
return edge_binding['router_id']
# fallback
return get_lb_resource_id(lb_id)
def get_lb_interface(context, plugin, lb_id, subnet_id):
filters = {'fixed_ips': {'subnet_id': [subnet_id]},
'device_id': [lb_id],
@ -60,7 +77,7 @@ def create_lb_interface(context, plugin, lb_id, subnet_id, tenant_id,
port = plugin.base_create_port(context, {'port': port_dict})
ip_addr = port['fixed_ips'][0]['ip_address']
net = netaddr.IPNetwork(subnet['cidr'])
resource_id = get_lb_resource_id(lb_id)
resource_id = get_lb_edge_name(context, lb_id)
address_groups = [{'primaryAddress': ip_addr,
'subnetPrefixLength': str(net.prefixlen),
@ -76,7 +93,7 @@ def create_lb_interface(context, plugin, lb_id, subnet_id, tenant_id,
def delete_lb_interface(context, plugin, lb_id, subnet_id):
resource_id = get_lb_resource_id(lb_id)
resource_id = get_lb_edge_name(context, lb_id)
subnet = plugin.get_subnet(context, subnet_id)
network_id = subnet.get('network_id')
lb_ports = get_lb_interface(context, plugin, lb_id, subnet_id)