os-vif 3.2.0__tar.gz → 3.7.1__tar.gz

os_vif-3.7.1/.coveragerc

@@ -0,0 +1,4 @@
+[run]
+branch = True
+source = os_vif
+omit = os_vif/tests/*

{os_vif-3.2.0 → os_vif-3.7.1}/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>
@@ -53,11 +54,13 @@ Spencer Yu <yushb@gohighsec.com>
 Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
 Stephen Finucane <sfinucan@redhat.com>
 Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi NATSUME <natsume.takashi@lab.ntt.co.jp>
 Takashi Natsume <takanattie@gmail.com>
 Thomas Bechtold <tbechtold@suse.com>
 Tony Breeds <tony@bakeyournoodle.com>
 Tony Xu <hhktony@gmail.com>
+Vasyl Saienko <vsaienko@mirantis.com>
 Vieri <15050873171@163.com>
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>
 XinxinShen <shenxinxin@inspur.com>
@@ -65,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.2.0 → os_vif-3.7.1}/ChangeLog

@@ -1,6 +1,49 @@
 CHANGES
 =======
 
+3.7.1
+-----
+
+* OVS Trunk: Add bridge\_name to external\_ids
+* Do not add taps in trunk bridges to the dead vlan
+* Update TOX\_CONSTRAINTS\_FILE for stable/2024.2
+* Update .gitreview for stable/2024.2
+
+3.7.0
+-----
+
+* Remove old excludes
+
+3.6.0
+-----
+
+* reno: Update master for unmaintained/zed
+* Update master for stable/2024.1
+* reno: Update master for unmaintained/xena
+* reno: Update master for unmaintained/wallaby
+* reno: Update master for unmaintained/victoria
+
+3.5.0
+-----
+
+* Drop wrong stacklevel
+* Fix missing or unnecessary dependencies
+* reno: Update master for unmaintained/yoga
+* tox: Drop envdir
+* Update python classifier in setup.cfg
+
+3.4.0
+-----
+
+* coveragerc: Remove non-existent path
+* Deprecate Windows support
+
+3.3.0
+-----
+
+* Update master for stable/2023.2
+* Don't break traffic if port already exists
+
 3.2.0
 -----
 

os_vif-3.7.1/PKG-INFO

@@ -0,0 +1,74 @@
+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
+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.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.8
+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
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+========================
+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-3.2.0 → os_vif-3.7.1}/doc/requirements.txt

@@ -1,3 +1,3 @@
-sphinx>=2.0.0,!=2.1.0 # BSD
+sphinx>=2.1.1 # BSD
 openstackdocstheme>=2.2.1 # Apache-2.0
 reno>=3.1.0 # Apache-2.0

{os_vif-3.2.0 → os_vif-3.7.1}/os_vif/internal/ip/api.py

@@ -11,10 +11,13 @@
 #    under the License.
 
 import os
+import warnings
 
 from oslo_log import log as logging
 
 if os.name == 'nt':
+    warnings.warn('Support for Windows OS is deprecated.',
+                  category=DeprecationWarning)
     from os_vif.internal.ip.windows.impl_netifaces import \
         Netifaces as ip_lib_class
 else:

os_vif-3.7.1/os_vif.egg-info/PKG-INFO

@@ -0,0 +1,74 @@
+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
+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.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.8
+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
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+========================
+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-3.2.0 → os_vif-3.7.1}/os_vif.egg-info/SOURCES.txt

@@ -99,11 +99,13 @@ 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-windows-support-49f5ca1b1a1f4d66.yaml
 releasenotes/notes/do-not-force-mac-ageing-c6e8d750130c5740.yaml
 releasenotes/notes/drop-py36-support-0e9b07073f6ad73f.yaml
 releasenotes/notes/drop-python2-support-7a4bc7d31253c1e5.yaml
 releasenotes/notes/ensure-ovs-bridge-a0c1b51f469c92d0.yaml
 releasenotes/notes/extend-vhostuser-object-fada14a1457d4e56.yaml
+releasenotes/notes/fix-broken-dataplane-on-nova-restart-with-isolate_vif-71617a41741b33e8.yaml
 releasenotes/notes/fix-ovs-plugin-describe-049750609559f1ba.yaml
 releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml
 releasenotes/notes/fix-vif-openvswitch-fa0d19be9dd668e1.yaml
@@ -119,6 +121,8 @@ releasenotes/notes/revert-always-plug-port-for-ovs-hybrid-plug-false-dc015985cbc
 releasenotes/notes/vhost-user-mtu-support-cbc7d02a6665fab1.yaml
 releasenotes/notes/vhost-user-reconnect-fa4cbb731b787f71.yaml
 releasenotes/source/2023.1.rst
+releasenotes/source/2023.2.rst
+releasenotes/source/2024.1.rst
 releasenotes/source/conf.py
 releasenotes/source/index.rst
 releasenotes/source/newton.rst

{os_vif-3.2.0 → os_vif-3.7.1}/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-3.7.1/os_vif.egg-info/pbr.json

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

{os_vif-3.2.0 → os_vif-3.7.1}/os_vif.egg-info/requires.txt

@@ -1,14 +1,13 @@
-debtcollector>=1.19.0
-netaddr>=0.7.18
+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!=2.1.0,>=2.0.0
-stevedore>=1.20.0
-
-[:(sys_platform!='win32')]
 pyroute2>=0.5.2
+stevedore>=1.20.0
+debtcollector>=1.19.0

os_vif-3.7.1/releasenotes/notes/deprecate-windows-support-49f5ca1b1a1f4d66.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Support for Windows operating systems has been deprecated.

os_vif-3.7.1/releasenotes/notes/fix-broken-dataplane-on-nova-restart-with-isolate_vif-71617a41741b33e8.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    An issue when after nova-compute service restart configured with
+    `isolate_vif=True` instances lost connectivity unless neutron
+    rebinds ports. Which is normally happening by agent restart or port
+    update.

os_vif-3.7.1/releasenotes/source/2023.2.rst

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

os_vif-3.7.1/releasenotes/source/2024.1.rst

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

{os_vif-3.2.0 → os_vif-3.7.1}/releasenotes/source/index.rst

@@ -6,6 +6,8 @@ Release Notes
    :maxdepth: 1
 
    unreleased
+   2024.1
+   2023.2
    2023.1
    zed
    yoga

{os_vif-3.2.0 → os_vif-3.7.1}/releasenotes/source/victoria.rst

@@ -3,4 +3,4 @@ Victoria Series Release Notes
 =============================
 
 .. release-notes::
-   :branch: stable/victoria
+   :branch: unmaintained/victoria

{os_vif-3.2.0 → os_vif-3.7.1}/releasenotes/source/wallaby.rst

@@ -3,4 +3,4 @@ Wallaby Series Release Notes
 ============================
 
 .. release-notes::
-   :branch: stable/wallaby
+   :branch: unmaintained/wallaby

{os_vif-3.2.0 → os_vif-3.7.1}/releasenotes/source/xena.rst

@@ -3,4 +3,4 @@ Xena Series Release Notes
 =========================
 
 .. release-notes::
-   :branch: stable/xena
+   :branch: unmaintained/xena

{os_vif-3.2.0 → os_vif-3.7.1}/releasenotes/source/yoga.rst

@@ -3,4 +3,4 @@ Yoga Series Release Notes
 =========================
 
 .. release-notes::
-   :branch: stable/yoga
+   :branch: unmaintained/yoga

{os_vif-3.2.0 → os_vif-3.7.1}/releasenotes/source/zed.rst

@@ -3,4 +3,4 @@ Zed Series Release Notes
 ========================
 
 .. release-notes::
-   :branch: stable/zed
+   :branch: unmaintained/zed

{os_vif-3.2.0 → os_vif-3.7.1}/requirements.txt

@@ -1,18 +1,14 @@
 # Requirements lower bounds listed here are our best effort to keep them up to
 # date but we do not test them so no guarantee of having them all correct. If
 # you find any incorrect lower bounds, let us know or propose a fix.
-
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
-netaddr>=0.7.18 # BSD
+pbr>=3.0.0 # Apache-2.0
 oslo.concurrency>=3.20.0 # Apache-2.0
 oslo.config>=5.1.0 # Apache-2.0
 oslo.log>=3.30.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.privsep>=1.23.0 # Apache-2.0
+oslo.serialization>=2.20.0 # Apache-2.0
+oslo.utils>=2.0.0  # Apache-2.0
 oslo.versionedobjects>=1.28.0 # Apache-2.0
 ovsdbapp>=0.12.1 # Apache-2.0
 pyroute2>=0.5.2;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)

{os_vif-3.2.0 → os_vif-3.7.1}/setup.cfg

@@ -18,6 +18,7 @@ classifier =
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: Implementation :: CPython
 
 [files]

{os_vif-3.2.0 → os_vif-3.7.1}/setup.py

@@ -13,16 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
 
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],

os_vif-3.7.1/test-requirements.txt

@@ -0,0 +1,5 @@
+coverage>=4.4.1 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+ovs>=2.9.2
+stestr>=3.1.0 # Apache-2.0
+testscenarios>=0.4 # Apache-2.0/BSD

{os_vif-3.2.0 → os_vif-3.7.1}/tox.ini

@@ -6,13 +6,12 @@ envlist = py3,pep8,docs,releasenotes,cover
 usedevelop = True
 setenv =
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 commands = stestr run --exclude-regex ".tests.functional" {posargs}
 
 [testenv:functional]
-envdir = {toxworkdir}/shared
 setenv =
   {[testenv]setenv}
 commands =
@@ -20,12 +19,11 @@ commands =
 
 [testenv:docs]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
-envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
 allowlist_externals =
   rm
@@ -36,7 +34,6 @@ commands =
   make -C doc/build/pdf
 
 [testenv:releasenotes]
-envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
@@ -47,7 +44,6 @@ deps =
   -r{toxinidir}/doc/requirements.txt
 
 [testenv:cover]
-envdir = {toxworkdir}/shared
 setenv =
   {[testenv]setenv}
   PYTHON=coverage run --source os_vif,vif_plug_linux_bridge,vif_plug_ovs,vif_plug_noop --parallel-mode
@@ -59,7 +55,6 @@ commands =
   coverage report
 
 [testenv:pep8]
-envdir = {toxworkdir}/shared
 deps =
   hacking>=3.0.1,<3.1.0
 commands = flake8

{os_vif-3.2.0 → os_vif-3.7.1}/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
 
@@ -186,6 +190,13 @@ class OvsPlugin(plugin.PluginBase):
 
         return True
 
+    def _isolate_vif(self, vif_name, bridge):
+        # NOTE(vsaienko): don't break traffic if port already exists,
+        # we assume it is called when nova-compute is initialized and
+        # since port is present it should be bound already.
+        return (self.config.isolate_vif and
+                not self.ovsdb.port_exists(vif_name, bridge))
+
     def _create_vif_port(self, vif, vif_name, instance_info, **kwargs):
         mtu = self._get_mtu(vif)
         # NOTE(sean-k-mooney): As part of a partial fix to bug #1734320
@@ -200,8 +211,13 @@ class OvsPlugin(plugin.PluginBase):
         # TODO(sean-k-mooney): Extend neutron to record what ml2 driver
         # bound the interface in the vif binding details so isolation
         # can be enabled automatically in the future.
-        if self.config.isolate_vif:
+        bridge = kwargs.pop('bridge', vif.network.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
@@ -215,7 +231,6 @@ class OvsPlugin(plugin.PluginBase):
             # for more details.
             if not self.ovsdb.port_exists(vif_name, vif.network.bridge):
                 kwargs['qos_type'] = qos_type
-        bridge = kwargs.pop('bridge', vif.network.bridge)
         self.ovsdb.create_ovs_vif_port(
             bridge,
             vif_name,
@@ -302,7 +317,9 @@ class OvsPlugin(plugin.PluginBase):
             vif, vif.vif_name, instance_info, bridge=port_bridge_name,
             set_ids=False
         )
-        tag = constants.DEAD_VLAN if self.config.isolate_vif else None
+        tag = (constants.DEAD_VLAN
+               if self._isolate_vif(int_bridge_patch, int_bridge_name)
+               else None)
         iface_id = vif.id
         mac = vif.address
         instance_id = instance_info.uuid
@@ -397,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):

{os_vif-3.2.0 → os_vif-3.7.1}/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: