os-vif 4.0.0__py3-none-any.whl → 4.1.0__py3-none-any.whl

os_vif/tests/unit/test_os_vif.py

@@ -105,10 +105,13 @@ class TestOSVIF(base.TestCase):
                                   entry_point="os-vif",
                                   plugin=DemoPlugin,
                                   obj=None)
-        with mock.patch('stevedore.extension.ExtensionManager.names',
-                        return_value=['foobar']),\
-                mock.patch('stevedore.extension.ExtensionManager.__getitem__',
-                           return_value=plg):
+        with mock.patch(
+            'stevedore.extension.ExtensionManager.names',
+            return_value=['foobar'],
+        ), mock.patch(
+            'stevedore.extension.ExtensionManager.__getitem__',
+            return_value=plg,
+        ):
             os_vif.initialize()
             info = objects.instance_info.InstanceInfo()
             vif = objects.vif.VIFBridge(
@@ -123,10 +126,13 @@ class TestOSVIF(base.TestCase):
                                   entry_point="os-vif",
                                   plugin=DemoPlugin,
                                   obj=None)
-        with mock.patch('stevedore.extension.ExtensionManager.names',
-                        return_value=['foobar']),\
-                mock.patch('stevedore.extension.ExtensionManager.__getitem__',
-                           return_value=plg):
+        with mock.patch(
+            'stevedore.extension.ExtensionManager.names',
+            return_value=['foobar']
+        ), mock.patch(
+            'stevedore.extension.ExtensionManager.__getitem__',
+            return_value=plg,
+        ):
             os_vif.initialize()
             info = objects.instance_info.InstanceInfo()
             vif = objects.vif.VIFBridge(

{os_vif-4.0.0.dist-info → os_vif-4.1.0.dist-info}/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>

{os_vif-4.0.0.dist-info → os_vif-4.1.0.dist-info}/METADATA

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
-Name: os-vif
-Version: 4.0.0
+Name: os_vif
+Version: 4.1.0
 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,21 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
-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.20.0)
-Requires-Dist: oslo.utils (>=2.0.0)
-Requires-Dist: oslo.versionedobjects (>=1.28.0)
-Requires-Dist: ovsdbapp (>=0.12.1)
-Requires-Dist: pbr (>=3.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')
 
 ========================
 Team and repository tags
@@ -64,5 +64,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-4.0.0.dist-info → os_vif-4.1.0.dist-info}/RECORD

@@ -35,7 +35,7 @@ os_vif/tests/unit/test_base.py,sha256=iqgweFRWprY98mkGL3HIbV9D8DuX_tUPH8uRiDflwD
 os_vif/tests/unit/test_exception.py,sha256=UDVJSR3CKU3rc5kmN14ilL9Fj0cgnwQbGoP4weo2P4w,1335
 os_vif/tests/unit/test_host_info.py,sha256=2PYHg4pY-YwUuSg9MyDKJbJhKVGRT6ujJATkzzIPx18,7576
 os_vif/tests/unit/test_objects.py,sha256=WflvhMvvCauXexj04tCw47HvsysHX4Q7fsgJKrPNaI8,3709
-os_vif/tests/unit/test_os_vif.py,sha256=ixMy3_RolD3K4ebWynRt7JLI63m_fb3XIO7qrXGCq60,6609
+os_vif/tests/unit/test_os_vif.py,sha256=b0h65Wa9tvxw-e7c707SoJQjfGzEALSFZUPkTtr_GkY,6612
 os_vif/tests/unit/test_vif.py,sha256=mhg2PZ3iVEPzffO5I0VT1wIUP3c-h7MAqrZgCuZdjxE,18000
 os_vif/tests/unit/internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 os_vif/tests/unit/internal/ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,7 +45,7 @@ os_vif/tests/unit/internal/ip/linux/test_impl_pyroute2.py,sha256=MbsDkFkVSmx3mqt
 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
-vif_plug_linux_bridge/linux_bridge.py,sha256=YMa_T8MfZBHmq0yQuA-fIYogZ-yRPKDzzBYGIfgUGO4,4949
+vif_plug_linux_bridge/linux_bridge.py,sha256=oNf-HuLuaixlOyAL2CgZeZ3OHSknUh-zMhmPDI6XOBc,5345
 vif_plug_linux_bridge/linux_net.py,sha256=0SuMKqMSNHRnSMs3XNVjBF0MPzhUuQIti159QkL8k1U,9481
 vif_plug_linux_bridge/privsep.py,sha256=dHAVOrY7kC3hrfDy7OAyt17XG2TpZHwgMr0Pmgx1XYM,884
 vif_plug_linux_bridge/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,29 +61,29 @@ vif_plug_ovs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/constants.py,sha256=vQKnYSeBMjV2RGQPGxk96D8FtgpvJIZEX_yZzUlsGg8,892
 vif_plug_ovs/exception.py,sha256=ZiECZVvjCFTVXhuii3uhJn4lZvozKRxziedZB3R9JNo,1328
 vif_plug_ovs/linux_net.py,sha256=HvhfSXjeAlU2l9iZNiN8CFr-GL9psS8Hk8_KAaktH6I,13922
-vif_plug_ovs/ovs.py,sha256=VfZtPMnBXIBZ7dDPfS5d9RGZFb7mkwPPptjFX_iO2YM,22767
+vif_plug_ovs/ovs.py,sha256=tN-JxK7VoIAdlradnk6kKCChenu_LLQWMKjJ_u834QY,22946
 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=ePYap6ZzxgJQRNmViFBKXy8WH0qWGCbd8FTaSSB_BYA,10227
+vif_plug_ovs/ovsdb/ovsdb_lib.py,sha256=SJuEnl26wGOLzEXNdgVhrKue2FTPgCpLiVLNak34Buw,10505
 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=GZKyA9UR9BaEgZ0tv6xyMTQnz9FpKedV2do1ePMB-rw,2059
-vif_plug_ovs/tests/functional/test_plugin.py,sha256=40gbf5bvxgauHf3U3oT9xeIOcZ3r8-fFRyHOrhWbZVo,6648
+vif_plug_ovs/tests/functional/test_plugin.py,sha256=JzRiEIUonC4STcV9GWiwyaJybgOVxMSHyLmqACBf8Ck,8264
 vif_plug_ovs/tests/functional/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/functional/ovsdb/test_ovsdb_lib.py,sha256=tXSTmjYWOmqLXYQ42_3Sv8XNNktlDxPDalJRr8KRwCU,13775
 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=93IhauJ-LscWMOJ0yCHBXAM47zVi-0oOOrMaln_dflU,30731
+vif_plug_ovs/tests/unit/test_plugin.py,sha256=YfJXJirOWbZB2l2VHTiJPCMZlgBCyRXDAFgzEj6pQeY,30827
 vif_plug_ovs/tests/unit/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/unit/ovsdb/test_ovsdb_lib.py,sha256=-Z50UgEgg2awEgPb_r_iqQBsyYTKlSadi3S9laGFfjg,10270
-os_vif-4.0.0.dist-info/AUTHORS,sha256=60BktTkASWCf8_6tpYaV0vj_2qxp9yPMKsPhZv0PM6c,3250
-os_vif-4.0.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-os_vif-4.0.0.dist-info/METADATA,sha256=qKa6NbHg0SplQTLycmCwnOeQjrtoP43XHnxx7EjaIiI,2357
-os_vif-4.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-os_vif-4.0.0.dist-info/entry_points.txt,sha256=UhIaj_WPv49yG316SjjDuMlSqGvym-_TVYEn5JKlEaQ,207
-os_vif-4.0.0.dist-info/pbr.json,sha256=5Hmya6COSIJXwp-Fb4_ZtNvHUG8ylqw2qkLwyvfPuWU,46
-os_vif-4.0.0.dist-info/top_level.txt,sha256=ULBxtkTk3bkfzCSYJjifWehfjJdMODVzC6SX5l_CNKo,56
-os_vif-4.0.0.dist-info/RECORD,,
+os_vif-4.1.0.dist-info/AUTHORS,sha256=Jl9BVjDjzq5vO3_b0rnuUWx-P4wsTnfH8iLVMFZrUH8,3290
+os_vif-4.1.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+os_vif-4.1.0.dist-info/METADATA,sha256=rDAbv57FXl1MAJQmQsJsLw5cK6bAEOHMwVCtVxEfOfI,2338
+os_vif-4.1.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+os_vif-4.1.0.dist-info/entry_points.txt,sha256=BU9WplZnF_bjwT4SQP5n1mKu2f0R5xXBOznXP1GygHM,206
+os_vif-4.1.0.dist-info/pbr.json,sha256=Yy5hVFB_dwDLDjOBUX039V8KA8i0TiV456Q_kkEfqDM,46
+os_vif-4.1.0.dist-info/top_level.txt,sha256=ULBxtkTk3bkfzCSYJjifWehfjJdMODVzC6SX5l_CNKo,56
+os_vif-4.1.0.dist-info/RECORD,,

{os_vif-4.0.0.dist-info → os_vif-4.1.0.dist-info}/WHEEL

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

{os_vif-4.0.0.dist-info → os_vif-4.1.0.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-4.1.0.dist-info/pbr.json

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

vif_plug_linux_bridge/linux_bridge.py

@@ -17,6 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import debtcollector.removals
 from os_vif import objects
 from os_vif import plugin
 from oslo_config import cfg
@@ -94,6 +95,10 @@ class LinuxBridgePlugin(plugin.PluginBase):
                     supported_port_profiles=[]),
             ])
 
+    @debtcollector.removals.remove(
+        message="LinuxBridgePlugin is deprecated and will be removed in "
+                "a future release",
+        category=DeprecationWarning)
     def plug(self, vif, instance_info):
         """Ensure that the bridge exists, and add VIF to it."""
         network = vif.network
@@ -111,6 +116,10 @@ class LinuxBridgePlugin(plugin.PluginBase):
                 linux_net.ensure_bridge(bridge_name, iface,
                                         filtering=install_filters, mtu=mtu)
 
+    @debtcollector.removals.remove(
+        message="LinuxBridgePlugin is deprecated and will be removed in "
+                "a future release",
+        category=DeprecationWarning)
     def unplug(self, vif, instance_info):
         # Nothing required to unplug a port for a VIF using standard
         # Linux bridge device...

vif_plug_ovs/ovs.py

@@ -202,8 +202,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 self._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
@@ -303,8 +307,8 @@ class OvsPlugin(plugin.PluginBase):
         instance_id = instance_info.uuid
         LOG.debug(
             'creating patch port pair \n'
-            f'{port_bridge_name}:({port_bridge_patch}) -> '
-            f'{int_bridge_name}:({int_bridge_patch})'
+            f'{port_bridge_name}: ({port_bridge_patch}) -> '
+            f'{int_bridge_name}: ({int_bridge_patch})'
         )
         self.ovsdb.create_patch_port_pair(
             port_bridge_name, port_bridge_patch, int_bridge_name,

vif_plug_ovs/ovsdb/ovsdb_lib.py

@@ -139,7 +139,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
 
@@ -204,6 +204,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,7 @@
 
 import testscenarios
 import time
+from unittest import mock
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
@@ -183,3 +184,37 @@ 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', [])

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-4.0.0.dist-info/pbr.json

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