x/vmware-nsx
Code Issues Proposed changes

NSX|V use context reader for router driver

Browse Source 
When adding a router GW during hte router creation, in some cases
the wrong router driver is retrived, causing errors.
Using the context reader solves this problem.

Change-Id: I109e2dfd09be3b1ecd8edc237d74c8747f28e7e8
This commit is contained in:
Adit Sarfaty 2018-12-04 14:16:16 +02:00
parent c657b0db27
commit 39c48c2d41
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -3599,12 +3599,15 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
def _update_router_gw_info(self, context, router_id, info, def _update_router_gw_info(self, context, router_id, info,
is_routes_update=False, is_routes_update=False,
force_update=False): force_update=False):
router_driver = self._find_router_driver(context, router_id) with db_api.CONTEXT_WRITER.using(context):
# use the reader context a this might be called from create_router
router_db = self._get_router(context, router_id)
router_driver = self._get_router_driver(context, router_db)
if info: if info:
try: try:
ext_ips = info.get('external_fixed_ips') ext_ips = info.get('external_fixed_ips')
network_id = info.get('network_id') network_id = info.get('network_id')
router_db = self._get_router(context, router_id)
org_enable_snat = router_db.enable_snat org_enable_snat = router_db.enable_snat
# Ensure that a router cannot have SNAT disabled if there are # Ensure that a router cannot have SNAT disabled if there are