os-vif 3.6.0__py3-none-any.whl → 3.7.1__py3-none-any.whl

{os_vif-3.6.0.dist-info → os_vif-3.7.1.dist-info}/METADATA

@@ -1,12 +1,10 @@
-Metadata-Version: 2.1
-Name: os-vif
-Version: 3.6.0
+Metadata-Version: 2.4
+Name: os_vif
+Version: 3.7.1
 Summary: A library for plugging and unplugging virtual interfaces in OpenStack.
 Home-page: https://docs.openstack.org/os-vif/latest/
 Author: OpenStack
 Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: System Administrators
@@ -21,19 +19,31 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.8
-Requires-Dist: debtcollector (>=1.19.0)
-Requires-Dist: oslo.concurrency (>=3.20.0)
-Requires-Dist: oslo.config (>=5.1.0)
-Requires-Dist: oslo.i18n (>=3.15.3)
-Requires-Dist: oslo.log (>=3.30.0)
-Requires-Dist: oslo.privsep (>=1.23.0)
-Requires-Dist: oslo.serialization (!=2.19.1,>=2.18.0)
-Requires-Dist: oslo.utils (>=2.0.0)
-Requires-Dist: oslo.versionedobjects (>=1.28.0)
-Requires-Dist: ovsdbapp (>=0.12.1)
-Requires-Dist: pbr (!=2.1.0,>=2.0.0)
-Requires-Dist: stevedore (>=1.20.0)
-Requires-Dist: pyroute2 (>=0.5.2) ; (sys_platform!='win32')
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: pbr>=3.0.0
+Requires-Dist: oslo.concurrency>=3.20.0
+Requires-Dist: oslo.config>=5.1.0
+Requires-Dist: oslo.log>=3.30.0
+Requires-Dist: oslo.i18n>=3.15.3
+Requires-Dist: oslo.privsep>=1.23.0
+Requires-Dist: oslo.serialization>=2.20.0
+Requires-Dist: oslo.utils>=2.0.0
+Requires-Dist: oslo.versionedobjects>=1.28.0
+Requires-Dist: ovsdbapp>=0.12.1
+Requires-Dist: stevedore>=1.20.0
+Requires-Dist: debtcollector>=1.19.0
+Requires-Dist: pyroute2>=0.5.2; sys_platform != "win32"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ========================
 Team and repository tags
@@ -64,5 +74,3 @@ A library for plugging and unplugging virtual interfaces in OpenStack.
 * Bugs: https://bugs.launchpad.net/os-vif
 * Release Notes: https://docs.openstack.org/releasenotes/os-vif
 
-
-

{os_vif-3.6.0.dist-info → os_vif-3.7.1.dist-info}/RECORD

@@ -46,6 +46,8 @@ os_vif/tests/unit/internal/ip/linux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 os_vif/tests/unit/internal/ip/linux/test_impl_pyroute2.py,sha256=MbsDkFkVSmx3mqteP7GW3ruy6ehvBCiQorkdWJjE5Qk,7364
 os_vif/tests/unit/internal/ip/windows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 os_vif/tests/unit/internal/ip/windows/test_impl_netifaces.py,sha256=fs1DI706OXTWGr4C8_UtbBEvxwImv3klrxmuktUYol8,1992
+os_vif-3.7.1.dist-info/licenses/AUTHORS,sha256=iB34YU9dzlY73v6RpPbu5FylPpid9dwICx0Ec_5en9U,3287
+os_vif-3.7.1.dist-info/licenses/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
 vif_plug_linux_bridge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_linux_bridge/constants.py,sha256=NC8n4uOMFCYrhq0sM1ZeGBKo-Gs4OMR60cYP47wMRCk,602
 vif_plug_linux_bridge/iptables.py,sha256=q4LmAMMzg-r9IgDNTu3jCLjNDM8b0JbGo-qmiA2B-JE,20641
@@ -65,29 +67,27 @@ vif_plug_ovs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/constants.py,sha256=P1ngaAA2MioPrSr58JtiDA8rxkl3thttgOvabEyZGIM,944
 vif_plug_ovs/exception.py,sha256=ZiECZVvjCFTVXhuii3uhJn4lZvozKRxziedZB3R9JNo,1328
 vif_plug_ovs/linux_net.py,sha256=nr2dNOECVZtiHSIQHFb5iRVyh7cfLPiIm4VEg3frgDE,14289
-vif_plug_ovs/ovs.py,sha256=hAkt-8CbpYuGcfUjb3NKjm41J5MniAQupVl6IsB5p7Q,24166
+vif_plug_ovs/ovs.py,sha256=85uBn0t3WieE2u9ccwFWJjpZOSiPPp73E0sRBQBvv8E,24317
 vif_plug_ovs/privsep.py,sha256=nPQUkYgjbSjaHMuu40fZArRnf8RBiR73l4YpDF1K1yQ,1100
 vif_plug_ovs/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/ovsdb/api.py,sha256=_jHR8xokDAPI8sw3IEWuT3hObJuskqVzeVMDaWRbIq0,1293
 vif_plug_ovs/ovsdb/impl_idl.py,sha256=DR1aHN8riBpZyNePwpvT9PRYbf9vLk4lRJ9VHRVq_to,3028
 vif_plug_ovs/ovsdb/impl_vsctl.py,sha256=MSf8JMrMqrwt5vH8KTsThjdnsttJEYJikIcJ12CTz8c,14437
-vif_plug_ovs/ovsdb/ovsdb_lib.py,sha256=UfVJG8PtIp2ps51JXp3El9rUgtfR12Mp5dna6_i-20M,10599
+vif_plug_ovs/ovsdb/ovsdb_lib.py,sha256=buXkRZaAUOsXDqic748ealJ_SfTYjw9teQaZqyMIBkI,11722
 vif_plug_ovs/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/functional/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/functional/base.py,sha256=9EDYKUqsoqVgrYmljb6fZvGmIruL2zNJdIHlEZ9kzu8,1872
-vif_plug_ovs/tests/functional/test_plugin.py,sha256=40gbf5bvxgauHf3U3oT9xeIOcZ3r8-fFRyHOrhWbZVo,6648
+vif_plug_ovs/tests/functional/test_plugin.py,sha256=1zVCielOSCKjn6NMMYfxEp1t-nmTUHGciPZeJghZd8c,10447
 vif_plug_ovs/tests/functional/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/functional/ovsdb/test_ovsdb_lib.py,sha256=oB06rO9KgezJ5fe4kxsKANkC6b7sqKkzSyO2_M-Q8gw,13513
 vif_plug_ovs/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/unit/test_linux_net.py,sha256=B3buNpn9EKZQPio5rNrIma_E5MUL9vBspdg5EqZ3RHk,17532
-vif_plug_ovs/tests/unit/test_plugin.py,sha256=-RmB-IGzaFaFmg-sNLupFd0sHwdRQ6IoGpgWFNdmv8k,33303
+vif_plug_ovs/tests/unit/test_plugin.py,sha256=lOiFMyqekVbluqGqhmjYSHCxterahuoZdBpyXXk5LbM,33399
 vif_plug_ovs/tests/unit/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vif_plug_ovs/tests/unit/ovsdb/test_ovsdb_lib.py,sha256=rNPmkH_xkGCrRDeUV_xQEAJ6A7sOH-sEGXvPYju1zwk,10705
-os_vif-3.6.0.dist-info/AUTHORS,sha256=kZdfNnkbapBsRD4W-nOGD5iPcwn83A2tZvVbRJxItcA,3215
-os_vif-3.6.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-os_vif-3.6.0.dist-info/METADATA,sha256=MOdEAtvggkUGcZo32mn7UHrDYi0DA8XMLPuZGHJKP8U,2373
-os_vif-3.6.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-os_vif-3.6.0.dist-info/entry_points.txt,sha256=UhIaj_WPv49yG316SjjDuMlSqGvym-_TVYEn5JKlEaQ,207
-os_vif-3.6.0.dist-info/pbr.json,sha256=TVSvqWNQsJPvKIABFcZfEquQmNtHSbUpbb3JmAZ21LM,46
-os_vif-3.6.0.dist-info/top_level.txt,sha256=ULBxtkTk3bkfzCSYJjifWehfjJdMODVzC6SX5l_CNKo,56
-os_vif-3.6.0.dist-info/RECORD,,
+vif_plug_ovs/tests/unit/ovsdb/test_ovsdb_lib.py,sha256=n62yhno9fqBq9Ei5syWvItPVtV9jNR0UC-zpsq4zikc,11122
+os_vif-3.7.1.dist-info/METADATA,sha256=u3pFp8PD2mlO7Vauoq31f2Kg9sOaj2PrzgYIxNchXxs,2532
+os_vif-3.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+os_vif-3.7.1.dist-info/entry_points.txt,sha256=BU9WplZnF_bjwT4SQP5n1mKu2f0R5xXBOznXP1GygHM,206
+os_vif-3.7.1.dist-info/pbr.json,sha256=5ZzZvG2ZD7Z-ZPsharg9Qbcjqn66ehiCDFYmPejQI6A,46
+os_vif-3.7.1.dist-info/top_level.txt,sha256=ULBxtkTk3bkfzCSYJjifWehfjJdMODVzC6SX5l_CNKo,56
+os_vif-3.7.1.dist-info/RECORD,,

{os_vif-3.6.0.dist-info → os_vif-3.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{os_vif-3.6.0.dist-info → os_vif-3.7.1.dist-info}/entry_points.txt

@@ -5,4 +5,3 @@ ovs = vif_plug_ovs.ovs:OvsPlugin
 
 [oslo.config.opts]
 os_vif = os_vif.opts:list_plugins_opts
-

{os_vif-3.6.0.dist-info → os_vif-3.7.1.dist-info/licenses}/AUTHORS

@@ -2,6 +2,7 @@ Adrian Chiris <adrianc@mellanox.com>
 Alin Balutoiu <abalutoiu@cloudbasesolutions.com>
 Andreas Jaeger <aj@suse.com>
 Balazs Gibizer <gibi@redhat.com>
+Bence Romsics <bence.romsics@gmail.com>
 Brian Haley <brian.haley@hpe.com>
 Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
 Carlos Goncalves <cgoncalves@redhat.com>
@@ -67,6 +68,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-3.7.1.dist-info/pbr.json

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

vif_plug_ovs/ovs.py

@@ -37,6 +37,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
 
@@ -208,8 +212,12 @@ class OvsPlugin(plugin.PluginBase):
         # bound the interface in the vif binding details so isolation
         # can be enabled automatically in the future.
         bridge = kwargs.pop('bridge', vif.network.bridge)
-        if self._isolate_vif(vif_name, bridge):
+        # See bug #2069543.
+        if (self._isolate_vif(vif_name, bridge) and
+                not is_trunk_bridge(bridge)):
             kwargs['tag'] = constants.DEAD_VLAN
+            kwargs['vlan_mode'] = 'trunk'
+            kwargs['trunks'] = constants.DEAD_VLAN
         qos_type = self._get_qos_type(vif)
         if qos_type is not None:
             # NOTE(sean-k-mooney): If the port is not already created
@@ -406,11 +414,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):

vif_plug_ovs/ovsdb/ovsdb_lib.py

@@ -17,6 +17,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
 
 
@@ -145,7 +146,7 @@ class BaseOVS(object):
         self, bridge, dev, iface_id, mac, instance_id,
         mtu=None, interface_type=None, vhost_server_path=None,
         tag=None, pf_pci=None, vf_num=None, set_ids=True, datapath_type=None,
-        qos_type=None
+        qos_type=None, vlan_mode=None, trunks=None
     ):
         """Create OVS port
 
@@ -173,6 +174,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))
@@ -210,6 +226,11 @@ class BaseOVS(object):
             txn.add(self.ovsdb.add_port(bridge, dev))
             if tag:
                 txn.add(self.ovsdb.db_set('Port', dev, ('tag', tag)))
+            if vlan_mode:
+                txn.add(self.ovsdb.db_set('Port', dev,
+                                          ('vlan_mode', vlan_mode)))
+            if trunks:
+                txn.add(self.ovsdb.db_set('Port', dev, ('trunks', trunks)))
             if qid:
                 txn.add(self.ovsdb.db_set('Port', dev, ('qos', qid)))
             if col_values:

vif_plug_ovs/tests/functional/test_plugin.py

@@ -12,6 +12,8 @@
 
 import testscenarios
 import time
+from unittest import mock
+import uuid
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
@@ -183,3 +185,98 @@ class TestOVSPlugin(testscenarios.WithScenarios,
         self._check_parameter(
             'QoS', str(qos_uuid), 'type', None
         )
+
+    def test_plug_br_int_isolate_vif_dead_vlan(self):
+        with mock.patch.object(self.plugin.config, 'isolate_vif', True):
+            network = objects.network.Network(
+                id='5449523c-3a08-11ef-86d6-17149687aa4d',
+                bridge='br-5449523c',
+                subnets=self.subnets,
+                vlan=99)
+            vif = objects.vif.VIFOpenVSwitch(
+                id='85cb9bc6-3a08-11ef-b2d4-9b7c38edd677',
+                address='ca:fe:de:ad:be:ef',
+                network=network,
+                port_profile=self.profile_ovs_system,
+                vif_name="port-85cb9bc6")
+            self.plugin.plug(vif, self.instance)
+            self.addCleanup(self._del_bridge, 'br-5449523c')
+            self._check_parameter('Port', vif.vif_name, 'tag', 4095)
+
+    def test_plug_trunk_bridge_ignores_isolate_vif(self):
+        with mock.patch.object(self.plugin.config, 'isolate_vif', True):
+            network = objects.network.Network(
+                id='ef98b384-3a0f-11ef-9009-47345fca266f',
+                bridge='tbr-ef98b384',
+                subnets=self.subnets,
+                vlan=99)
+            vif = objects.vif.VIFOpenVSwitch(
+                id='631f52bc-3a07-11ef-a006-1319ef9d6edd',
+                address='ca:fe:de:ad:be:ef',
+                network=network,
+                port_profile=self.profile_ovs_system,
+                vif_name='port-631f52bc')
+            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)

vif_plug_ovs/tests/unit/ovsdb/test_ovsdb_lib.py

@@ -99,19 +99,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})
@@ -138,6 +141,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'

vif_plug_ovs/tests/unit/test_plugin.py

@@ -219,7 +219,10 @@ class PluginTest(testtools.TestCase):
                 self.vif_ovs.address, self.instance.uuid,
                 mtu=plugin.config.network_device_mtu,
                 interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE,
-                tag=constants.DEAD_VLAN)
+                tag=constants.DEAD_VLAN,
+                vlan_mode='trunk',
+                trunks=constants.DEAD_VLAN
+                )
 
     @mock.patch.object(ovsdb_lib.BaseOVS, 'create_ovs_vif_port')
     @mock.patch.object(ovsdb_lib.BaseOVS, 'port_exists')

os_vif-3.6.0.dist-info/pbr.json

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