From 77e7688e9b3c4f111c72ef34b654bdc1017fd5ce Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Sat, 13 Sep 2025 09:09:49 +0000 Subject: [PATCH] Fix is_up Change-Id: I0f89a371e58c6119299ee8c21cae69d2efc39898 Signed-off-by: Hongbin Lu --- kuryr/lib/binding/drivers/utils.py | 6 +----- kuryr/tests/unit/binding/drivers/test_utils.py | 9 ++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/kuryr/lib/binding/drivers/utils.py b/kuryr/lib/binding/drivers/utils.py index 8e2f5bb2..5fccf7fa 100644 --- a/kuryr/lib/binding/drivers/utils.py +++ b/kuryr/lib/binding/drivers/utils.py @@ -12,7 +12,6 @@ import ipaddress import pyroute2 -from pyroute2.netlink.rtnl import ifinfmsg from kuryr.lib import constants @@ -82,10 +81,7 @@ def remove_device(ifname): def is_up(interface): - flags = interface['flags'] - if not flags: - return False - return (flags & ifinfmsg.IFF_UP) == 1 + return interface.get('state', '') == 'up' def _configure_container_iface(iface, subnets, fixed_ips, mtu=None, diff --git a/kuryr/tests/unit/binding/drivers/test_utils.py b/kuryr/tests/unit/binding/drivers/test_utils.py index 6990e094..a5765d3e 100644 --- a/kuryr/tests/unit/binding/drivers/test_utils.py +++ b/kuryr/tests/unit/binding/drivers/test_utils.py @@ -14,8 +14,7 @@ from unittest import mock import ddt from oslo_utils import uuidutils -import pyroute2.ipdb -from pyroute2.netlink.rtnl import ifinfmsg +import pyroute2.ipdb.interfaces from kuryr.lib.binding.drivers import utils from kuryr.lib import constants @@ -44,9 +43,9 @@ class BindingDriversUtilsTest(base.TestCase): @ddt.data((False), (True)) def test_is_up(self, interface_flag): - fake_interface = {'flags': 0x0} + fake_interface = {} if interface_flag: - fake_interface['flags'] = ifinfmsg.IFF_UP + fake_interface['state'] = 'up' self.assertEqual(True, utils.is_up(fake_interface)) else: self.assertEqual(False, utils.is_up(fake_interface)) @@ -105,7 +104,7 @@ class BindingDriversUtilsTest(base.TestCase): 'tenant_id': '51b66b97a12f42a990452967d2c555ac', 'updated_at': '2016-09-27T08:57:13'}] - fake_iface = mock.Mock(spec=pyroute2.ipdb.Interface) + fake_iface = mock.Mock(spec=pyroute2.ipdb.interfaces.Interface) _set_mtu = mock.Mock() _set_address = mock.Mock() fake_iface.attach_mock(_set_mtu, 'set_mtu')