openstack/neutron
Code Issues Proposed changes

Merge "Check interface presence in new namespace" into stable/ussuri

Browse Source
This commit is contained in:
Zuul 2021-11-24 05:42:19 +00:00 committed by Gerrit Code Review
commit 55de7e5471
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,6 +456,8 @@ class IpLinkCommand(IpDeviceCommandBase):
privileged.set_link_attribute( privileged.set_link_attribute(
self.name, self._parent.namespace, net_ns_fd=namespace) self.name, self._parent.namespace, net_ns_fd=namespace)
self._parent.namespace = namespace self._parent.namespace = namespace
common_utils.wait_until_true(lambda: self.exists, timeout=5,
sleep=0.5)
def set_name(self, name): def set_name(self, name):
privileged.set_link_attribute( privileged.set_link_attribute(

11
neutron/tests/functional/agent/linux/test_ip_lib.py
View File

@ -1100,3 +1100,14 @@ class GetDevicesWithIpTestCase(functional_base.BaseSudoTestCase):
ip_addresses = self._remove_loopback_interface(ip_addresses) ip_addresses = self._remove_loopback_interface(ip_addresses)
ip_addresses = self._remove_ipv6_scope_link(ip_addresses) ip_addresses = self._remove_ipv6_scope_link(ip_addresses)
self.assertEqual(0, len(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)

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

@ -658,8 +658,9 @@ class TestIpLinkCommand(TestIPCmdBase):
set_link_attribute.assert_called_once_with( set_link_attribute.assert_called_once_with(
self.parent.name, self.parent.namespace, state='down') 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') @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 original_namespace = self.parent.namespace
self.link_cmd.set_netns('foo') self.link_cmd.set_netns('foo')
set_link_attribute.assert_called_once_with( set_link_attribute.assert_called_once_with(