x/vmware-nsx
Code Issues Proposed changes

Merge "Reverse the order of interface update and DNAT rule config"

Browse Source
This commit is contained in:
Jenkins 2013-09-30 07:16:55 +00:00 committed by Gerrit Code Review
commit 637850e05a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/nicira/NeutronServicePlugin.py
View File

@ -710,8 +710,8 @@ class NvpAdvancedPlugin(sr_db.ServiceRouter_mixin,
router = self._get_router(context, router_id) router = self._get_router(context, router_id)
# TODO(fank): do rollback on error, or have a dedicated thread # TODO(fank): do rollback on error, or have a dedicated thread
# do sync work (rollback, re-configure, or make router down) # do sync work (rollback, re-configure, or make router down)
self._update_interface(context, router)
self._update_nat_rules(context, router) self._update_nat_rules(context, router)
self._update_interface(context, router)
return fip return fip
def update_floatingip(self, context, id, floatingip): def update_floatingip(self, context, id, floatingip):
@ -722,8 +722,8 @@ class NvpAdvancedPlugin(sr_db.ServiceRouter_mixin,
router = self._get_router(context, router_id) router = self._get_router(context, router_id)
# TODO(fank): do rollback on error, or have a dedicated thread # TODO(fank): do rollback on error, or have a dedicated thread
# do sync work (rollback, re-configure, or make router down) # do sync work (rollback, re-configure, or make router down)
self._update_interface(context, router)
self._update_nat_rules(context, router) self._update_nat_rules(context, router)
self._update_interface(context, router)
return fip return fip
def delete_floatingip(self, context, id): def delete_floatingip(self, context, id):