x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX|V: don't fail when router binding does not exist"

This commit is contained in:
Jenkins 2016-07-04 14:28:20 +00:00 committed by Gerrit Code Review
parent 8aab94b772 8bd69430b2
commit 55ca468900
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
View File

@ -2199,9 +2199,12 @@ def _delete_interface(nsxv_manager, context, router_id, network_id,
def update_nat_rules(nsxv_manager, context, router_id, snat, dnat):
binding = nsxv_db.get_nsxv_router_binding(context.session, router_id)
task = nsxv_manager.update_nat_rules(
router_id, binding['edge_id'], snat, dnat)
task.wait(task_const.TaskState.RESULT)
if binding:
task = nsxv_manager.update_nat_rules(
router_id, binding['edge_id'], snat, dnat)
task.wait(task_const.TaskState.RESULT)
else:
LOG.warning(_LW("Bindings do not exists for %s"), router_id)
def update_dnat_rules(nsxv_manager, context, router_id, dnat_rules):