openstack
/
neutron
Code Issues Proposed changes

Separate the command for replace_port to delete and add 

When a port has been added to router namespace, trying to replace the
port by adding del-port and add-port in one command, will not bring
the new port to kernel. Even if the port is updated in ovs db and can
be found on br-int, system can't see the new port. This will break
the following actions, which will manipulate the new port by ip
commands. A mail list has been filed to discuss this issue at [1].

The problem here will break the scenario that namespace is deleted
unexpectedly, and l3-agent tries to rebuild the namespace at restart.

Separating replace_port to two commands: del-port and add-port,
matches the original logic and has been verified that it can resolve
the problem here.

[1] http://openvswitch.org/pipermail/discuss/2015-December/019667.html

Conflicts:
	neutron/tests/functional/agent/l3/test_legacy_router.py

Change-Id: If36bcf5a0cccb667f3087aea1e9ea9f20eb3a563
Closes-Bug: #1519926
(cherry picked from commit 8b7e5997da)
This commit is contained in:
Hong Hui Xiao 2015-12-08 01:17:54 -05:00 committed by Ihar Hrachyshka
parent 5ceb23d77f
commit 54f8819935
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/agent/common/ovs_lib.py
View File

@ -205,8 +205,12 @@ class OVSBridge(BaseOVS):
def replace_port(self, port_name, *interface_attr_tuples):
"""Replace existing port or create it, and configure port interface."""
# NOTE(xiaohhui): If del_port is inside the transaction, there will
# only be one command for replace_port. This will cause the new port
# not be found by system, which will lead to Bug #1519926.
self.ovsdb.del_port(port_name).execute()
with self.ovsdb.transaction() as txn:
txn.add(self.ovsdb.del_port(port_name))
txn.add(self.ovsdb.add_port(self.br_name, port_name,
may_exist=False))
if interface_attr_tuples:

21
neutron/tests/functional/agent/test_l3_agent.py
View File

@ -427,6 +427,27 @@ class L3AgentTestCase(L3AgentTestFramework):
self._router_lifecycle(enable_ha=False, dual_stack=True,
v6_ext_gw_with_sub=False)
def test_legacy_router_ns_rebuild(self):
router_info = self.generate_router_info(False)
router = self.manage_router(self.agent, router_info)
gw_port = router.router['gw_port']
gw_inf_name = router.get_external_device_name(gw_port['id'])
router_ports = [gw_inf_name]
for i_port in router_info.get(l3_constants.INTERFACE_KEY, []):
interface_name = router.get_internal_device_name(i_port['id'])
router_ports.append(interface_name)
namespaces.Namespace.delete(router.router_namespace)
# l3 agent should be able to rebuild the ns when it is deleted
self.manage_router(self.agent, router_info)
# Assert the router ports are there in namespace
self.assertTrue(
all([ip_lib.device_exists(port, namespace=router.ns_name)
for port in router_ports]))
self._delete_router(self.agent, router.router_id)
def test_ha_router_lifecycle(self):
self._router_lifecycle(enable_ha=True)