Check interface presence in new namespace
When an interface is moved to a new namespace, specially with OVS internal ports, the interface first dissapears from any network namespace and then is added again. ovs-vswitchd service detects this interface change as reported in [1]. This delay is the cause of the related bug, where some interfaces are not present when the L3 agent needs to manipulate them. [1]https://bugs.launchpad.net/neutron/+bug/1948832/comments/3 Conflicts: neutron/tests/functional/agent/linux/test_ip_lib.py Closes-Bug: #1948832 Change-Id: I3af4d0afa784899689ccb595ce6ba64495431eb9 (cherry picked from commitebc4766990
) (cherry picked from commit9c41365041
)
This commit is contained in:
parent
7dc407da94
commit
d14ee014ff
|
@ -456,6 +456,8 @@ class IpLinkCommand(IpDeviceCommandBase):
|
|||
privileged.set_link_attribute(
|
||||
self.name, self._parent.namespace, net_ns_fd=namespace)
|
||||
self._parent.namespace = namespace
|
||||
common_utils.wait_until_true(lambda: self.exists, timeout=5,
|
||||
sleep=0.5)
|
||||
|
||||
def set_name(self, name):
|
||||
privileged.set_link_attribute(
|
||||
|
|
|
@ -1100,3 +1100,14 @@ class GetDevicesWithIpTestCase(functional_base.BaseSudoTestCase):
|
|||
ip_addresses = self._remove_loopback_interface(ip_addresses)
|
||||
ip_addresses = self._remove_ipv6_scope_link(ip_addresses)
|
||||
self.assertEqual(0, len(ip_addresses))
|
||||
|
||||
|
||||
class IpLinkCommandTestCase(IpLibTestFramework):
|
||||
|
||||
def test_set_netns(self):
|
||||
device_name = ('int_' + uuidutils.generate_uuid())[
|
||||
:constants.DEVICE_NAME_MAX_LEN]
|
||||
device = ip_lib.IPDevice(device_name, kind='dummy')
|
||||
device.link.create()
|
||||
namespace = self.useFixture(net_helpers.NamespaceFixture())
|
||||
device.link.set_netns(namespace.name)
|
||||
|
|
|
@ -657,8 +657,9 @@ class TestIpLinkCommand(TestIPCmdBase):
|
|||
set_link_attribute.assert_called_once_with(
|
||||
self.parent.name, self.parent.namespace, state='down')
|
||||
|
||||
@mock.patch.object(priv_lib, 'interface_exists', return_value=True)
|
||||
@mock.patch.object(priv_lib, 'set_link_attribute')
|
||||
def test_set_netns(self, set_link_attribute):
|
||||
def test_set_netns(self, set_link_attribute, *args):
|
||||
original_namespace = self.parent.namespace
|
||||
self.link_cmd.set_netns('foo')
|
||||
set_link_attribute.assert_called_once_with(
|
||||
|
|
Loading…
Reference in New Issue