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

{os_vif-3.5.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>
@@ -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.5.0 → os_vif-3.7.1}/ChangeLog

@@ -1,12 +1,36 @@
 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
 -----

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.5.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.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.5.0 → os_vif-3.7.1}/os_vif.egg-info/SOURCES.txt

@@ -122,6 +122,7 @@ 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.5.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.5.0 → os_vif-3.7.1}/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.19.1,>=2.18.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/source/2024.1.rst

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

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

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

{os_vif-3.5.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.5.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.5.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.5.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.5.0 → os_vif-3.7.1}/requirements.txt

@@ -1,13 +1,13 @@
 # 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.
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
+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.19.1,>=2.18.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

{os_vif-3.5.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.5.0 → os_vif-3.7.1}/test-requirements.txt

@@ -1,4 +1,4 @@
-coverage!=4.4,>=4.0 # Apache-2.0
+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

{os_vif-3.5.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.5.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
 
@@ -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):

{os_vif-3.5.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:

{os_vif-3.5.0 → os_vif-3.7.1}/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)

{os_vif-3.5.0 → os_vif-3.7.1}/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'

{os_vif-3.5.0 → os_vif-3.7.1}/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')