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

os_vif-3.4.0/.coveragerc

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

{os_vif-3.2.0 → os_vif-3.4.0}/AUTHORS

@@ -53,11 +53,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>

{os_vif-3.2.0 → os_vif-3.4.0}/ChangeLog

@@ -1,6 +1,18 @@
 CHANGES
 =======
 
+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.2.0 → os_vif-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: os_vif
-Version: 3.2.0
+Version: 3.4.0
 Summary: A library for plugging and unplugging virtual interfaces in OpenStack.
 Home-page: https://docs.openstack.org/os-vif/latest/
 Author: OpenStack

{os_vif-3.2.0 → os_vif-3.4.0}/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, stacklevel=3)
     from os_vif.internal.ip.windows.impl_netifaces import \
         Netifaces as ip_lib_class
 else:

{os_vif-3.2.0 → os_vif-3.4.0}/os_vif.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: os-vif
-Version: 3.2.0
+Version: 3.4.0
 Summary: A library for plugging and unplugging virtual interfaces in OpenStack.
 Home-page: https://docs.openstack.org/os-vif/latest/
 Author: OpenStack

{os_vif-3.2.0 → os_vif-3.4.0}/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,7 @@ 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/conf.py
 releasenotes/source/index.rst
 releasenotes/source/newton.rst

os_vif-3.4.0/os_vif.egg-info/pbr.json

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

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

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

os_vif-3.4.0/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.4.0/releasenotes/source/2023.2.rst

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

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

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

{os_vif-3.2.0 → os_vif-3.4.0}/vif_plug_ovs/ovs.py

@@ -186,6 +186,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,7 +207,8 @@ 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)
+        if self._isolate_vif(vif_name, bridge):
             kwargs['tag'] = constants.DEAD_VLAN
         qos_type = self._get_qos_type(vif)
         if qos_type is not None:
@@ -215,7 +223,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 +309,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

{os_vif-3.2.0 → os_vif-3.4.0}/vif_plug_ovs/tests/unit/test_plugin.py

@@ -187,8 +187,28 @@ class PluginTest(testtools.TestCase):
             interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE)
 
     @mock.patch.object(ovsdb_lib.BaseOVS, 'create_ovs_vif_port')
-    def test_create_vif_port_isolate(self, mock_create_ovs_vif_port):
+    @mock.patch.object(ovsdb_lib.BaseOVS, 'port_exists')
+    def test_create_vif_port_isolate_port_no_isolate_vif_no_port(
+            self, mock_port_exists, mock_create_ovs_vif_port):
         plugin = ovs.OvsPlugin.load(constants.PLUGIN_NAME)
+        mock_port_exists.return_value = False
+        with mock.patch.object(plugin.config, 'isolate_vif', False):
+            plugin._create_vif_port(
+                self.vif_ovs, mock.sentinel.vif_name, self.instance,
+                interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE)
+            mock_create_ovs_vif_port.assert_called_once_with(
+                self.vif_ovs.network.bridge, mock.sentinel.vif_name,
+                self.vif_ovs.port_profile.interface_id,
+                self.vif_ovs.address, self.instance.uuid,
+                mtu=plugin.config.network_device_mtu,
+                interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE)
+
+    @mock.patch.object(ovsdb_lib.BaseOVS, 'create_ovs_vif_port')
+    @mock.patch.object(ovsdb_lib.BaseOVS, 'port_exists')
+    def test_create_vif_port_isolate_port_isolate_vif_no_port(
+            self, mock_port_exists, mock_create_ovs_vif_port):
+        plugin = ovs.OvsPlugin.load(constants.PLUGIN_NAME)
+        mock_port_exists.return_value = False
         with mock.patch.object(plugin.config, 'isolate_vif', True):
             plugin._create_vif_port(
                 self.vif_ovs, mock.sentinel.vif_name, self.instance,
@@ -201,6 +221,23 @@ class PluginTest(testtools.TestCase):
                 interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE,
                 tag=constants.DEAD_VLAN)
 
+    @mock.patch.object(ovsdb_lib.BaseOVS, 'create_ovs_vif_port')
+    @mock.patch.object(ovsdb_lib.BaseOVS, 'port_exists')
+    def test_create_vif_port_isolate_port_isolate_vif_port_exists(
+            self, mock_port_exists, mock_create_ovs_vif_port):
+        plugin = ovs.OvsPlugin.load(constants.PLUGIN_NAME)
+        mock_port_exists.return_value = True
+        with mock.patch.object(plugin.config, 'isolate_vif', True):
+            plugin._create_vif_port(
+                self.vif_ovs, mock.sentinel.vif_name, self.instance,
+                interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE)
+            mock_create_ovs_vif_port.assert_called_once_with(
+                self.vif_ovs.network.bridge, mock.sentinel.vif_name,
+                self.vif_ovs.port_profile.interface_id,
+                self.vif_ovs.address, self.instance.uuid,
+                mtu=plugin.config.network_device_mtu,
+                interface_type=constants.OVS_VHOSTUSER_INTERFACE_TYPE)
+
     @mock.patch.object(ovs, 'sys')
     @mock.patch.object(ovs.OvsPlugin, '_plug_vif_generic')
     def test_plug_ovs_port_bridge_false(self, plug_vif_generic, mock_sys):

os_vif-3.2.0/.coveragerc

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

os_vif-3.2.0/os_vif.egg-info/pbr.json

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