x/vmware-nsx
Code Issues Proposed changes

Merge "NSXP/v3: lookup router with different owner"

Browse Source
This commit is contained in:
Zuul 2019-04-23 08:06:48 +00:00 committed by Gerrit Code Review
commit 2114510a32
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/services/lbaas/nsx_p/implementation/lb_utils.py
View File

@ -118,7 +118,7 @@ def update_rule_in_policy(rule):
@log_helpers.log_method_call
def update_router_lb_vip_advertisement(context, core_plugin, router_id):
router = core_plugin.get_router(context, router_id)
router = core_plugin.get_router(context.elevated(), router_id)
# Add a rule to advertise external vips on the router
external_subnets = core_plugin._find_router_gw_subnets(

6
vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py
View File

@ -68,7 +68,7 @@ class EdgeLoadBalancerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
raise n_exc.BadRequest(resource='lbaas-subnet', msg=msg)
if router_id and not self.core_plugin.service_router_has_services(
context, router_id):
context.elevated(), router_id):
self.core_plugin.create_service_router(context, router_id)
lb_name = utils.get_name_and_uuid(lb['name'] or 'lb',
@ -118,8 +118,8 @@ class EdgeLoadBalancerManagerFromDict(base_mgr.NsxpLoadbalancerBaseManager):
try:
service_client.delete(lb['id'])
if not self.core_plugin.service_router_has_services(context,
router_id):
if not self.core_plugin.service_router_has_services(
context.elevated(), router_id):
self.core_plugin.delete_service_router(router_id)
except Exception as e:
with excutils.save_and_reraise_exception():

4
vmware_nsx/services/lbaas/nsx_v3/implementation/lb_utils.py
View File

@ -56,9 +56,9 @@ def get_router_from_network(context, plugin, subnet_id):
network_id = subnet['network_id']
port_filters = {'device_owner': [l3_db.DEVICE_OWNER_ROUTER_INTF],
'network_id': [network_id]}
ports = plugin.get_ports(context, filters=port_filters)
ports = plugin.get_ports(context.elevated(), filters=port_filters)
if ports:
router = plugin.get_router(context, ports[0]['device_id'])
router = plugin.get_router(context.elevated(), ports[0]['device_id'])
if router.get('external_gateway_info'):
return router['id']