openstack
/
neutron
Code Issues Proposed changes

Merge "Make dvr router port creation retriable" into stable/pike

This commit is contained in:
Zuul 2018-08-10 11:27:09 +00:00 committed by Gerrit Code Review
parent ad8f00236c e44b43187a
commit 51b9e15ac8
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
neutron/db/l3_db.py
View File

@ -880,19 +880,8 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
self._notify_attaching_interface(context, router_db=router,
port=port,
interface_info=interface_info)
l3_obj.RouterPort(
context,
port_id=port['id'],
router_id=router.id,
port_type=device_owner
).create()
# Update owner after actual process again in order to
# make sure the records in routerports table and ports
# table are consistent.
self._core_plugin.update_port(
context, port['id'], {'port': {
'device_id': router.id,
'device_owner': device_owner}})
self._add_router_port(
context, port['id'], router.id, device_owner)
gw_ips = []
gw_network_id = None
@ -918,6 +907,21 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
router.id, port['tenant_id'], port['id'], port['network_id'],
subnets[-1]['id'], [subnet['id'] for subnet in subnets])
@db_api.retry_if_session_inactive()
def _add_router_port(self, context, port_id, router_id, device_owner):
l3_obj.RouterPort(
context,
port_id=port_id,
router_id=router_id,
port_type=device_owner
).create()
# Update owner after actual process again in order to
# make sure the records in routerports table and ports
# table are consistent.
self._core_plugin.update_port(
context, port_id, {'port': {'device_id': router_id,
'device_owner': device_owner}})
def _confirm_router_interface_not_in_use(self, context, router_id,
subnet_id):
subnet = self._core_plugin.get_subnet(context, subnet_id)