``IpLinkCommand.set_netns`` "is_ovs_port" parameter no longer needed

The input parameter "is_ovs_port" is no longer needed in the method
``IpLinkCommand.set_netns`` since [1].

[1]https://review.opendev.org/c/openstack/neutron/+/905836

Trivial-Fix

Change-Id: I0e36cf8afe76904997e14eca415a0e978f05c55a
This commit is contained in:
Rodolfo Alonso Hernandez 2024-02-19 09:45:00 +00:00 committed by Rodolfo Alonso
parent 016f5187a5
commit ebb7ec1eed
4 changed files with 8 additions and 9 deletions

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, is_ovs_port=True)
namespace_obj.add_device_to_namespace(device)
break
except ip_lib.NetworkInterfaceNotFound:
# NOTE(slaweq): if the exception was NetworkInterfaceNotFound

View File

@ -285,9 +285,9 @@ class IPWrapper(SubProcessBase):
return True
return False
def add_device_to_namespace(self, device, is_ovs_port=False):
def add_device_to_namespace(self, device):
if self.namespace:
device.link.set_netns(self.namespace, is_ovs_port=is_ovs_port)
device.link.set_netns(self.namespace)
def add_vlan(self, name, physical_interface, vlan_id):
privileged.create_interface(name,
@ -477,7 +477,7 @@ class IpLinkCommand(IpDeviceCommandBase):
privileged.set_link_attribute(
self.name, self._parent.namespace, state='down')
def set_netns(self, namespace, is_ovs_port=False):
def set_netns(self, namespace):
old_namespace = self._parent.namespace
try:
privileged.set_link_attribute(

View File

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

View File

@ -522,8 +522,7 @@ 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', is_ovs_port=False)])
dev.assert_has_calls([mock.call.link.set_netns('ns')])
def test_add_device_to_namespace_is_none(self):
dev = mock.Mock()