os-vif 4.0.0__tar.gz → 4.2.0__tar.gz

os_vif-4.2.0/.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: mixed-line-ending
+        args: ['--fix', 'lf']
+        exclude: '.*\.(svg)$'
+      - id: check-byte-order-marker
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: check-yaml
+        files: .*\.(yaml|yml)$
+        exclude: '^zuul.d/.*$'
+  - repo: https://opendev.org/openstack/hacking
+    rev: 7.0.0
+    hooks:
+      - id: hacking
+        additional_dependencies: []
+        exclude: '^(doc|releasenotes)/.*$'

{os_vif-4.0.0 → os_vif-4.2.0}/.zuul.yaml

@@ -120,44 +120,14 @@
             os_vif_ovs:
               per_port_bridge: true
 
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on Focal. This job can be removed in the nexy cycle (2025.2)
 - job:
-    name: os-vif-linuxbridge
-    parent: os-vif-tempest-base
+    name: os-vif-ovn-ubuntu-jammy
     description: |
-      os-vif linux bridge job derived from neutron-tempest-linuxbridge
-    vars:
-      devstack_services:
-        # Disable OVN services
-        br-ex-tcpdump: false
-        br-int-flows: false
-        ovn-controller: false
-        ovn-northd: false
-        ovs-vswitchd: false
-        ovsdb-server: false
-        q-ovn-metadata-agent: false
-        # Neutron services
-        q-agt: true
-        q-dhcp: true
-        q-l3: true
-        q-meta: true
-        q-metering: true
-      devstack_localrc:
-        Q_AGENT: linuxbridge
-        Q_ML2_PLUGIN_MECHANISM_DRIVERS: linuxbridge
-        Q_ML2_TENANT_NETWORK_TYPE: vxlan
-      devstack_local_conf:
-        post-config:
-          "/$NEUTRON_CORE_PLUGIN_CONF":
-            experimental:
-              linuxbridge: true
-            ml2:
-              type_drivers: flat,vlan,local,vxlan
-            ml2_type_vlan:
-              network_vlan_ranges: foo:1:10
-            agent:
-              tunnel_types: vxlan
-            securitygroup:
-              firewall_driver: iptables
+      os-vif ovn job (tests hybrid-plug=false) testing on Ubuntu Focal(20.04)
+    parent: os-vif-ovn
+    nodeset: openstack-single-node-jammy
 
 - project:
     templates:
@@ -168,15 +138,13 @@
       - openstack-cover-jobs
     check:
       jobs:
-        - kuryr-kubernetes-tempest:
-            voting: false
         - openstack-tox-functional-ovs-with-sudo
         - os-vif-ovn
+        - os-vif-ovn-ubuntu-jammy
         - os-vif-ovs-iptables
-        - os-vif-linuxbridge
     gate:
       jobs:
         - openstack-tox-functional-ovs-with-sudo
         - os-vif-ovn
+        - os-vif-ovn-ubuntu-jammy
         - os-vif-ovs-iptables
-        - os-vif-linuxbridge

{os_vif-4.0.0 → os_vif-4.2.0}/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>
@@ -68,6 +69,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.0.0 → os_vif-4.2.0}/ChangeLog

@@ -1,12 +1,30 @@
 CHANGES
 =======
 
+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
+-----
+
+* Update gate jobs as per the 2025.1 cycle testing runtime
+* Deprecate linux bridge plugin
+* Drop kuryr-kubernetes-tempest
+* Remove os-vif-linuxbridge
+* Do not add taps in trunk bridges to the dead vlan
+
 4.0.0
 -----
 
 * Clean up Windows support
 * address test stablity under load
 * reno: Update master for unmaintained/2023.1
+* Integrate pre-commit
 * Remove Python 3.8 support
 * Update master for stable/2024.2
 

os_vif-4.2.0/PKG-INFO

@@ -0,0 +1,65 @@
+Metadata-Version: 2.1
+Name: os_vif
+Version: 4.2.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
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.9
+License-File: LICENSE
+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: pyroute2>=0.5.2
+Requires-Dist: stevedore>=1.20.0
+Requires-Dist: debtcollector>=1.19.0
+
+========================
+Team and repository tags
+========================
+
+.. image:: https://governance.openstack.org/tc/badges/os-vif.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+======
+os-vif
+======
+
+.. image:: https://img.shields.io/pypi/v/os-vif.svg
+    :target: https://pypi.org/project/os-vif/
+    :alt: Latest Version
+
+.. image:: https://img.shields.io/pypi/dm/os-vif.svg
+    :target: https://pypi.org/project/os-vif/
+    :alt: Downloads
+
+A library for plugging and unplugging virtual interfaces in OpenStack.
+
+* License: Apache License, Version 2.0
+* Documentation: https://docs.openstack.org/os-vif/latest/
+* Source: https://opendev.org/openstack/os-vif
+* Bugs: https://bugs.launchpad.net/os-vif
+* Release Notes: https://docs.openstack.org/releasenotes/os-vif
+

{os_vif-4.0.0 → os_vif-4.2.0}/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.0.0 → os_vif-4.2.0}/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.2.0/os_vif.egg-info/PKG-INFO

@@ -0,0 +1,65 @@
+Metadata-Version: 2.1
+Name: os_vif
+Version: 4.2.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
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.9
+License-File: LICENSE
+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: pyroute2>=0.5.2
+Requires-Dist: stevedore>=1.20.0
+Requires-Dist: debtcollector>=1.19.0
+
+========================
+Team and repository tags
+========================
+
+.. image:: https://governance.openstack.org/tc/badges/os-vif.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+======
+os-vif
+======
+
+.. image:: https://img.shields.io/pypi/v/os-vif.svg
+    :target: https://pypi.org/project/os-vif/
+    :alt: Latest Version
+
+.. image:: https://img.shields.io/pypi/dm/os-vif.svg
+    :target: https://pypi.org/project/os-vif/
+    :alt: Downloads
+
+A library for plugging and unplugging virtual interfaces in OpenStack.
+
+* License: Apache License, Version 2.0
+* Documentation: https://docs.openstack.org/os-vif/latest/
+* Source: https://opendev.org/openstack/os-vif
+* Bugs: https://bugs.launchpad.net/os-vif
+* Release Notes: https://docs.openstack.org/releasenotes/os-vif
+

{os_vif-4.0.0 → os_vif-4.2.0}/os_vif.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 .coveragerc
 .mailmap
+.pre-commit-config.yaml
 .stestr.conf
 .zuul.yaml
 AUTHORS
@@ -9,6 +10,7 @@ HACKING.rst
 LICENSE
 README.rst
 bindep.txt
+pyproject.toml
 requirements.txt
 setup.cfg
 setup.py
@@ -95,6 +97,7 @@ releasenotes/notes/bug-1892132-812e6d5ce0588ebb.yaml
 releasenotes/notes/contextlib-and-nested-with-statements-2747a9ebb9a5bfd7.yaml
 releasenotes/notes/default-qos-policy-for-ovs-26f8806046a59c82.yaml
 releasenotes/notes/default-to-native-ovsdb-driver-112fb5adf6e19a30.yaml
+releasenotes/notes/deprecate-linuxbridge-support-d278d4bbdff8e8bc.yaml
 releasenotes/notes/deprecate-windows-support-49f5ca1b1a1f4d66.yaml
 releasenotes/notes/do-not-force-mac-ageing-c6e8d750130c5740.yaml
 releasenotes/notes/drop-py36-support-0e9b07073f6ad73f.yaml
@@ -122,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.0.0 → os_vif-4.2.0}/os_vif.egg-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.2.0/os_vif.egg-info/pbr.json

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

{os_vif-4.0.0 → os_vif-4.2.0}/os_vif.egg-info/requires.txt

@@ -1,15 +1,13 @@
-debtcollector>=1.19.0
+pbr>=3.0.0
 oslo.concurrency>=3.20.0
 oslo.config>=5.1.0
-oslo.i18n>=3.15.3
 oslo.log>=3.30.0
+oslo.i18n>=3.15.3
 oslo.privsep>=1.23.0
 oslo.serialization>=2.20.0
 oslo.utils>=2.0.0
 oslo.versionedobjects>=1.28.0
 ovsdbapp>=0.12.1
-pbr>=3.0.0
-stevedore>=1.20.0
-
-[:(sys_platform!='win32')]
 pyroute2>=0.5.2
+stevedore>=1.20.0
+debtcollector>=1.19.0

os_vif-4.2.0/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.0/releasenotes/notes/deprecate-linuxbridge-support-d278d4bbdff8e8bc.yaml

@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The LinuxBridge mechanism driver has been removed in neutron. os-vif has a
+    policy of only shipping plugins for in-tree neutron ml2 drivers. As a result
+    the linux_bridge os-vif plugin is now deprecated and will be removed in
+    a future openstack release.

{os_vif-4.0.0 → os_vif-4.2.0}/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml

@@ -1,6 +1,6 @@
 ---
 fixes:
-  - os-vif plugins were previously incorrectly registered 
+  - os-vif plugins were previously incorrectly registered
     in both the setup.py and setup.cfg. All plugin registration
     have been removed form the setup.py as they were not used
     and may have blocked registration of out of tree plugins.

os_vif-4.2.0/releasenotes/source/2025.1.rst

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

{os_vif-4.0.0 → os_vif-4.2.0}/releasenotes/source/index.rst

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

{os_vif-4.0.0 → os_vif-4.2.0}/tox.ini

@@ -57,9 +57,13 @@ commands =
   coverage report
 
 [testenv:pep8]
+description =
+    Run style checks.
+skip_install = true
 deps =
-  hacking>=3.0.1,<3.1.0
-commands = flake8
+    pre-commit
+commands =
+    pre-commit run --all-files --show-diff-on-failure
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.

{os_vif-4.0.0 → os_vif-4.2.0}/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...

{os_vif-4.0.0 → os_vif-4.2.0}/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
 
@@ -202,8 +206,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
@@ -303,8 +311,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,
@@ -384,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.0.0 → os_vif-4.2.0}/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
 
 
@@ -139,7 +140,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
 
@@ -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))
@@ -204,6 +220,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: