openstack/neutron
Code Issues Proposed changes

Merge "Add sleep before checking if ovs port is in the namespace"

Browse Source
This commit is contained in:
Zuul 2023-03-02 15:22:42 +00:00 committed by Gerrit Code Review
commit 9d5d706f7b
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/interface.py
View File

@ -365,7 +365,7 @@ class OVSInterfaceDriver(LinuxInterfaceDriver):
namespace_obj = ip_wrapper.ensure_namespace(namespace)
for i in range(9):
try:
namespace_obj.add_device_to_namespace(device)
namespace_obj.add_device_to_namespace(device, is_ovs_port=True)
break
except ip_lib.NetworkInterfaceNotFound:
# NOTE(slaweq): if the exception was NetworkInterfaceNotFound

11
neutron/agent/linux/ip_lib.py
View File

@ -265,9 +265,9 @@ class IPWrapper(SubProcessBase):
return True
return False
def add_device_to_namespace(self, device):
def add_device_to_namespace(self, device, is_ovs_port=False):
if self.namespace:
device.link.set_netns(self.namespace)
device.link.set_netns(self.namespace, is_ovs_port=is_ovs_port)
def add_vlan(self, name, physical_interface, vlan_id):
privileged.create_interface(name,
@ -457,10 +457,15 @@ class IpLinkCommand(IpDeviceCommandBase):
privileged.set_link_attribute(
self.name, self._parent.namespace, state='down')
def set_netns(self, namespace):
def set_netns(self, namespace, is_ovs_port=False):
privileged.set_link_attribute(
self.name, self._parent.namespace, net_ns_fd=namespace)
self._parent.namespace = namespace
if is_ovs_port:
# NOTE(slaweq): because of the "shy port" which may dissapear for
# short time after it's moved to the namespace we need to wait
# a bit before checking if port really exists in the namespace
time.sleep(1)
common_utils.wait_until_true(lambda: self.exists, timeout=5,
sleep=0.5)

6
neutron/tests/unit/agent/linux/test_interface.py
View File

@ -470,11 +470,11 @@ class TestOVSInterfaceDriver(TestBase):
expected.extend(
[mock.call().ensure_namespace(namespace),
mock.call().ensure_namespace().add_device_to_namespace(
mock.ANY),
mock.ANY, is_ovs_port=True),
mock.call().ensure_namespace().add_device_to_namespace(
mock.ANY),
mock.ANY, is_ovs_port=True),
mock.call().ensure_namespace().add_device_to_namespace(
mock.ANY)])
mock.ANY, is_ovs_port=True)])
expected.extend([
mock.call(namespace=namespace),
mock.call().device('tap0'),

3
neutron/tests/unit/agent/linux/test_ip_lib.py
View File

@ -507,7 +507,8 @@ class TestIpWrapper(base.BaseTestCase):
def test_add_device_to_namespace(self):
dev = mock.Mock()
ip_lib.IPWrapper(namespace='ns').add_device_to_namespace(dev)
dev.assert_has_calls([mock.call.link.set_netns('ns')])
dev.assert_has_calls(
[mock.call.link.set_netns('ns', is_ovs_port=False)])
def test_add_device_to_namespace_is_none(self):
dev = mock.Mock()