os-vif 3.2.0__py3-none-any.whl → 3.4.0__py3-none-any.whl

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.dist-info → os_vif-3.4.0.dist-info}/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.dist-info → os_vif-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 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.dist-info → os_vif-3.4.0.dist-info}/RECORD

@@ -7,7 +7,7 @@ os_vif/utils.py,sha256=bmJRam0laHAVLIHpQufzLASu_VTEqsGTuJYmoYfqOco,713
 os_vif/version.py,sha256=ilQe2xTxPDxlzJYWbq8KdHeashflTfC1OZewgFPKPRI,713
 os_vif/internal/__init__.py,sha256=VGE1e9o-7RkuTzNhZl4Wivz1tojriLYypVBObhSZfSk,967
 os_vif/internal/ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-os_vif/internal/ip/api.py,sha256=fz51BFW-JL2vrkD8VxxzGZXDi56VikoTXxB1YuWHrsE,888
+os_vif/internal/ip/api.py,sha256=Y5vbHnc5mvfy4a3t1ZbnDuSyn0eYBCaj0SMUZTYmjPM,1024
 os_vif/internal/ip/ip_command.py,sha256=agySNBD4GHp87uo6HbtIg4JwtOMhfuRZN5X7ytPir5k,2787
 os_vif/internal/ip/linux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 os_vif/internal/ip/linux/impl_pyroute2.py,sha256=ddQ9d7fzBJEYmE1wJhMfpmHftTBFdJ2C94dCNGRsB0A,5511
@@ -65,7 +65,7 @@ vif_plug_ovs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/constants.py,sha256=P1ngaAA2MioPrSr58JtiDA8rxkl3thttgOvabEyZGIM,944
 vif_plug_ovs/exception.py,sha256=ZiECZVvjCFTVXhuii3uhJn4lZvozKRxziedZB3R9JNo,1328
 vif_plug_ovs/linux_net.py,sha256=nr2dNOECVZtiHSIQHFb5iRVyh7cfLPiIm4VEg3frgDE,14289
-vif_plug_ovs/ovs.py,sha256=gUpOqhGqmWRfcDWFfctGwP3nJqNKmQqij7HRGNBSdaY,23740
+vif_plug_ovs/ovs.py,sha256=hAkt-8CbpYuGcfUjb3NKjm41J5MniAQupVl6IsB5p7Q,24166
 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
@@ -80,14 +80,14 @@ vif_plug_ovs/tests/functional/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 vif_plug_ovs/tests/functional/ovsdb/test_ovsdb_lib.py,sha256=oB06rO9KgezJ5fe4kxsKANkC6b7sqKkzSyO2_M-Q8gw,13513
 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=6Nk8Dsv-DlmhXofSnb_f8Qs6SCDGzMRu4SEUShxwWaw,31199
+vif_plug_ovs/tests/unit/test_plugin.py,sha256=-RmB-IGzaFaFmg-sNLupFd0sHwdRQ6IoGpgWFNdmv8k,33303
 vif_plug_ovs/tests/unit/ovsdb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vif_plug_ovs/tests/unit/ovsdb/test_ovsdb_lib.py,sha256=rNPmkH_xkGCrRDeUV_xQEAJ6A7sOH-sEGXvPYju1zwk,10705
-os_vif-3.2.0.dist-info/AUTHORS,sha256=pqvtQTCtkonuLkD0R1k5wJdehEO19mDpXtHaSQh-Axs,3132
-os_vif-3.2.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-os_vif-3.2.0.dist-info/METADATA,sha256=7a_Hm63QMuaPZXD1GdhMafB_7tfNxVpINHuPfIj7YTQ,2266
-os_vif-3.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-os_vif-3.2.0.dist-info/entry_points.txt,sha256=UhIaj_WPv49yG316SjjDuMlSqGvym-_TVYEn5JKlEaQ,207
-os_vif-3.2.0.dist-info/pbr.json,sha256=yPKC04UCFJTK52u4xAajBv7s59GkiBMmvEbGu6qAjW0,46
-os_vif-3.2.0.dist-info/top_level.txt,sha256=ULBxtkTk3bkfzCSYJjifWehfjJdMODVzC6SX5l_CNKo,56
-os_vif-3.2.0.dist-info/RECORD,,
+os_vif-3.4.0.dist-info/AUTHORS,sha256=kZdfNnkbapBsRD4W-nOGD5iPcwn83A2tZvVbRJxItcA,3215
+os_vif-3.4.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+os_vif-3.4.0.dist-info/METADATA,sha256=MFiEAjbSqJsuU7uDxen2GrLpVWrQTLh0dhgi0uq4_oA,2266
+os_vif-3.4.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+os_vif-3.4.0.dist-info/entry_points.txt,sha256=UhIaj_WPv49yG316SjjDuMlSqGvym-_TVYEn5JKlEaQ,207
+os_vif-3.4.0.dist-info/pbr.json,sha256=FyCNHsu9j3w5kGMlF_yaUlDqbkdo3ERqpGeuG9cihY4,46
+os_vif-3.4.0.dist-info/top_level.txt,sha256=ULBxtkTk3bkfzCSYJjifWehfjJdMODVzC6SX5l_CNKo,56
+os_vif-3.4.0.dist-info/RECORD,,

os_vif-3.4.0.dist-info/pbr.json

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

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

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

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