os-vif 4.1.0__tar.gz → 4.2.1__tar.gz

{os_vif-4.1.0 → os_vif-4.2.1}/.zuul.yaml

@@ -26,7 +26,6 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
       devstack_localrc:
-        USE_PYTHON3: true
         FORCE_CONFIG_DRIVE: true
         ENABLE_VOLUME_MULTIATTACH: true
         # NOTE(sean-k-mooney) we do not have to set

{os_vif-4.1.0 → os_vif-4.2.1}/AUTHORS

@@ -10,6 +10,7 @@ ChangBo Guo(gcb) <eric.guo@easystack.cn>
 Charles Short <chucks@redhat.com>
 Claudiu Belu <cbelu@cloudbasesolutions.com>
 Corey Bryant <corey.bryant@canonical.com>
+Cyril Roelandt <cyril@redhat.com>
 Daniel P. Berrange <berrange@redhat.com>
 Davanum Srinivas <davanum@gmail.com>
 David Vallee Delisle <dvd@redhat.com>
@@ -69,6 +70,7 @@ YAMAMOTO Takashi <yamamoto@midokura.com>
 ZhijunWei <wzj334965317@outlook.com>
 blue55 <yllan@fiberhome.com>
 caoyuan <cao.yuan@99cloud.net>
+elajkat <lajos.katona@est.tech>
 ericxiett <eric_xiett@163.com>
 gecong1973 <ge.cong@zte.com.cn>
 jacky06 <zhang.min@99cloud.net>

{os_vif-4.1.0 → os_vif-4.2.1}/ChangeLog

@@ -1,6 +1,19 @@
 CHANGES
 =======
 
+4.2.1
+-----
+
+* Zuul: do not use USE\_PYTHON3
+
+4.2.0
+-----
+
+* OVS Trunk: Add bridge\_name to external\_ids
+* add pyproject.toml to support pip 23.1
+* Adapt unit tests to pyroute2 0.9.1
+* Update master for stable/2025.1
+
 4.1.0
 -----
 

{os_vif-4.1.0 → os_vif-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: os_vif
-Version: 4.1.0
+Version: 4.2.1
 Summary: A library for plugging and unplugging virtual interfaces in OpenStack.
 Home-page: https://docs.openstack.org/os-vif/latest/
 Author: OpenStack

{os_vif-4.1.0 → os_vif-4.2.1}/os_vif/tests/unit/internal/ip/linux/test_impl_pyroute2.py

@@ -38,12 +38,14 @@ class TestIpCommand(base.TestCase):
     def setUp(self):
         super(TestIpCommand, self).setUp()
         self.ip = impl_pyroute2.PyRoute2()
-        self.ip_link_p = mock.patch.object(iproute.IPRoute, 'link')
+        self.ip_link_p = mock.patch.object(iproute.IPRoute, 'link',
+                                           create=True)
         self.ip_link = self.ip_link_p.start()
 
     def test_set(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[1]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[1],
+                create=True) as mock_link_lookup:
             self.ip_link.return_value = [{'flags': 0x4000}]
             self.ip.set(self.DEVICE, state=self.UP, mtu=self.MTU,
                         address=self.MAC, promisc=True)
@@ -57,8 +59,9 @@ class TestIpCommand(base.TestCase):
             self.ip_link.assert_has_calls(calls)
 
     def test_set_exit_code(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[1]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[1],
+                create=True) as mock_link_lookup:
             self.ip_link.side_effect = ipexc.NetlinkError(self.ERROR_CODE,
                                                           msg="Error message")
 
@@ -70,8 +73,9 @@ class TestIpCommand(base.TestCase):
                               check_exit_code=[self.OTHER_ERROR_CODE])
 
     def test_set_no_interface_found(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[],
+                create=True) as mock_link_lookup:
             self.assertRaises(exception.NetworkInterfaceNotFound, self.ip.set,
                               self.DEVICE)
             mock_link_lookup.assert_called_once_with(ifname=self.DEVICE)
@@ -83,8 +87,9 @@ class TestIpCommand(base.TestCase):
             'add', ifname=self.DEVICE, kind=self.TYPE_VETH, peer='peer')
 
     def test_add_vlan(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[1]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[1],
+                create=True) as mock_link_lookup:
             self.ip.add(self.DEVICE, self.TYPE_VLAN, link=self.LINK,
                         vlan_id=self.VLAN_ID)
             mock_link_lookup.assert_called_once_with(ifname=self.LINK)
@@ -114,8 +119,9 @@ class TestIpCommand(base.TestCase):
         self.ip_link.assert_called_once_with('add', **args)
 
     def test_add_vlan_no_interface_found(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[],
+                create=True) as mock_link_lookup:
             self.assertRaises(exception.NetworkInterfaceNotFound, self.ip.add,
                               self.DEVICE, self.TYPE_VLAN, link=self.LINK)
             mock_link_lookup.assert_called_once_with(ifname=self.LINK)
@@ -141,22 +147,25 @@ class TestIpCommand(base.TestCase):
             check_exit_code=[self.OTHER_ERROR_CODE])
 
     def test_delete(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[1]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[1],
+                create=True) as mock_link_lookup:
             self.ip.delete(self.DEVICE)
             mock_link_lookup.assert_called_once_with(ifname=self.DEVICE)
             self.ip_link.assert_called_once_with('del', index=1)
 
     def test_delete_no_interface_found(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[],
+                create=True) as mock_link_lookup:
             self.assertRaises(exception.NetworkInterfaceNotFound,
                               self.ip.delete, self.DEVICE)
             mock_link_lookup.assert_called_once_with(ifname=self.DEVICE)
 
     def test_delete_exit_code(self):
-        with mock.patch.object(iproute.IPRoute, 'link_lookup',
-                               return_value=[1]) as mock_link_lookup:
+        with mock.patch.object(
+                iproute.IPRoute, 'link_lookup', return_value=[1],
+                create=True) as mock_link_lookup:
             self.ip_link.side_effect = ipexc.NetlinkError(self.ERROR_CODE,
                                                           msg="Error message")
 

{os_vif-4.1.0 → os_vif-4.2.1}/os_vif.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: os_vif
-Version: 4.1.0
+Version: 4.2.1
 Summary: A library for plugging and unplugging virtual interfaces in OpenStack.
 Home-page: https://docs.openstack.org/os-vif/latest/
 Author: OpenStack

{os_vif-4.1.0 → os_vif-4.2.1}/os_vif.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ HACKING.rst
 LICENSE
 README.rst
 bindep.txt
+pyproject.toml
 requirements.txt
 setup.cfg
 setup.py
@@ -124,6 +125,7 @@ releasenotes/source/2023.1.rst
 releasenotes/source/2023.2.rst
 releasenotes/source/2024.1.rst
 releasenotes/source/2024.2.rst
+releasenotes/source/2025.1.rst
 releasenotes/source/conf.py
 releasenotes/source/index.rst
 releasenotes/source/newton.rst

os_vif-4.2.1/os_vif.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "b33415b", "is_release": true}

os_vif-4.2.1/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["pbr>=5.7.0", "setuptools>=64.0.0", "wheel"]
+build-backend = "pbr.build"

os_vif-4.2.1/releasenotes/source/2025.1.rst

@@ -0,0 +1,6 @@
+===========================
+2025.1 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2025.1

{os_vif-4.1.0 → os_vif-4.2.1}/releasenotes/source/index.rst

@@ -6,6 +6,7 @@ Release Notes
    :maxdepth: 1
 
    unreleased
+   2025.1
    2024.2
    2024.1
    2023.2

{os_vif-4.1.0 → os_vif-4.2.1}/vif_plug_ovs/ovs.py

@@ -34,6 +34,10 @@ from vif_plug_ovs.ovsdb import ovsdb_lib
 LOG = logging.getLogger(__name__)
 
 
+def is_trunk_bridge(bridge_name):
+    return bridge_name.startswith(constants.TRUNK_BR_PREFIX)
+
+
 class OvsPlugin(plugin.PluginBase):
     """An OVS plugin that can setup VIFs in many ways
 
@@ -204,7 +208,7 @@ class OvsPlugin(plugin.PluginBase):
         bridge = kwargs.pop('bridge', vif.network.bridge)
         # See bug #2069543.
         if (self._isolate_vif(vif_name, bridge) and
-                not self._is_trunk_bridge(bridge)):
+                not is_trunk_bridge(bridge)):
             kwargs['tag'] = constants.DEAD_VLAN
             kwargs['vlan_mode'] = 'trunk'
             kwargs['trunks'] = constants.DEAD_VLAN
@@ -388,11 +392,8 @@ class OvsPlugin(plugin.PluginBase):
                 vif=vif,
                 err="This vif type is not supported by this plugin")
 
-    def _is_trunk_bridge(self, bridge_name):
-        return bridge_name.startswith(constants.TRUNK_BR_PREFIX)
-
     def _delete_bridge_if_trunk(self, vif):
-        if self._is_trunk_bridge(vif.network.bridge):
+        if is_trunk_bridge(vif.network.bridge):
             self.ovsdb.delete_ovs_bridge(vif.network.bridge)
 
     def _unplug_vhostuser(self, vif, instance_info):

{os_vif-4.1.0 → os_vif-4.2.1}/vif_plug_ovs/ovsdb/ovsdb_lib.py

@@ -16,6 +16,7 @@ from oslo_log import log as logging
 
 from vif_plug_ovs import constants
 from vif_plug_ovs import linux_net
+from vif_plug_ovs import ovs
 from vif_plug_ovs.ovsdb import api as ovsdb_api
 
 
@@ -167,6 +168,21 @@ class BaseOVS(object):
                         'iface-status': 'active',
                         'attached-mac': mac,
                         'vm-uuid': instance_id}
+
+        # Note(lajoskatona): Neutron fills external_ids for trunk, see:
+        # https://opendev.org/openstack/neutron/src/commit/
+        # 1bc4b526e9c743423069ab4cf6ef3883d5e48217/neutron/services/trunk/
+        # drivers/openvswitch/agent/ovsdb_handler.py#L418
+        # The following keys are added there: bridge_name, trunk_id and
+        # subport_ids. These values are used during the cleanup after the
+        # deletion of the trunk. It can happen that Neutron can't fill these
+        # fields.
+        # In os-vif when the plug happens we can use the same transaction to
+        # add bridge_name to external_ids in case of it is a trunk.
+        # By this Neutron can do the cleanup of trunk related interfaces.
+        if ovs.is_trunk_bridge(bridge):
+            external_ids['bridge_name'] = bridge
+
         col_values = [('external_ids', external_ids)] if set_ids else []
         if interface_type:
             col_values.append(('type', interface_type))

{os_vif-4.1.0 → os_vif-4.2.1}/vif_plug_ovs/tests/functional/test_plugin.py

@@ -13,6 +13,7 @@
 import testscenarios
 import time
 from unittest import mock
+import uuid
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
@@ -218,3 +219,64 @@ class TestOVSPlugin(testscenarios.WithScenarios,
             self.plugin.plug(vif, self.instance)
             self.addCleanup(self._del_bridge, 'tbr-ef98b384')
             self._check_parameter('Port', vif.vif_name, 'tag', [])
+
+    def test_plug_trunk_bridge_fills_bridge_name(self):
+        mac = 'ca:fe:de:ad:be:ef'
+        iface_id = str(uuid.uuid4())
+        vif_name = 'port-%s' % iface_id[:8]
+        trunk_id = str(uuid.uuid4())
+        bridge_name = 'tbr-%s' % trunk_id[:8]
+
+        network = objects.network.Network(
+            id=trunk_id,
+            bridge=bridge_name,
+            subnets=self.subnets,
+            vlan=99)
+        vif = objects.vif.VIFOpenVSwitch(
+            id=iface_id,
+            address=mac,
+            network=network,
+            port_profile=self.profile_ovs_system,
+            vif_name=vif_name)
+        self.plugin.plug(vif, self.instance)
+        self.addCleanup(self._del_bridge, bridge_name)
+        expected_external_ids = {
+            'attached-mac': mac,
+            'bridge_name': bridge_name,
+            'iface-id': self.profile_ovs.interface_id,
+            'iface-status': 'active',
+            'vm-uuid': self.instance.uuid,
+        }
+
+        self._check_parameter('Interface', vif.vif_name,
+                              'external_ids', expected_external_ids)
+
+    def test_plug_non_trunk_leave_bridge_name_empty(self):
+        mac = 'ca:fe:de:ad:be:ef'
+        iface_id = str(uuid.uuid4())
+        vif_name = 'port-%s' % iface_id[:8]
+        bridge_name = 'br-something'
+
+        network = objects.network.Network(
+            id=str(uuid.uuid4()),
+            bridge=bridge_name,
+            subnets=self.subnets,
+            vlan=99)
+        vif = objects.vif.VIFOpenVSwitch(
+            id=iface_id,
+            address=mac,
+            network=network,
+            port_profile=self.profile_ovs_system,
+            vif_name=vif_name)
+        self.plugin.plug(vif, self.instance)
+        self.addCleanup(self._del_bridge, bridge_name)
+        # bridge_name is filled only in case of trunk plug
+        expected_external_ids = {
+            'attached-mac': mac,
+            'iface-id': self.profile_ovs.interface_id,
+            'iface-status': 'active',
+            'vm-uuid': self.instance.uuid,
+        }
+
+        self._check_parameter('Interface', vif.vif_name,
+                              'external_ids', expected_external_ids)

{os_vif-4.1.0 → os_vif-4.2.1}/vif_plug_ovs/tests/unit/ovsdb/test_ovsdb_lib.py

@@ -89,19 +89,22 @@ class BaseOVSTest(testtools.TestCase):
             )
             mock_set_mtu_request.assert_not_called()
 
-    def test_create_ovs_vif_port(self):
+    def _test_create_ovs_vif_port(self, bridge_name='bridge',
+                                  check_br_name=False):
         iface_id = 'iface_id'
         mac = 'ca:fe:ca:fe:ca:fe'
         instance_id = uuidutils.generate_uuid()
         interface_type = constants.OVS_VHOSTUSER_INTERFACE_TYPE
         vhost_server_path = '/fake/path'
         device = 'device'
-        bridge = 'bridge'
+        bridge = bridge_name
         mtu = 1500
         external_ids = {'iface-id': iface_id,
                         'iface-status': 'active',
                         'attached-mac': mac,
                         'vm-uuid': instance_id}
+        if check_br_name:
+            external_ids['bridge_name'] = bridge_name
         values = [('external_ids', external_ids),
                   ('type', interface_type),
                   ('options', {'vhost-server-path': vhost_server_path})
@@ -128,6 +131,13 @@ class BaseOVSTest(testtools.TestCase):
                     ]
                 )
 
+    def test_create_ovs_vif_port(self):
+        self._test_create_ovs_vif_port()
+
+    def test_create_ovs_vif_port_for_trunk(self):
+        self._test_create_ovs_vif_port(bridge_name='tbr-12345',
+                                       check_br_name=True)
+
     def test_create_ovs_vif_port_type_dpdk(self):
         iface_id = 'iface_id'
         mac = 'ca:fe:ca:fe:ca:fe'

os_vif-4.1.0/os_vif.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "acdd974", "is_release": true}