From df421a9b2e743f00ac27c030e5094f784f72599a Mon Sep 17 00:00:00 2001 From: Kien Nguyen Date: Mon, 26 Jun 2017 14:27:11 +0700 Subject: [PATCH] Add compatibility for pyroute2>=0.4.15 Pyroute2 was updated, its change make some testcases failed. This patch fix the problem with pyroute2 update. Change-Id: I300f9830927a8babf9112f9aff265ef4b2e5e03e Closes-Bug: #1700469 --- kuryr/lib/binding/drivers/ipvlan.py | 2 +- kuryr/tests/unit/binding/drivers/test_ipvlan.py | 4 ++-- kuryr/tests/unit/binding/drivers/test_macvlan.py | 4 ++-- kuryr/tests/unit/binding/drivers/test_utils.py | 4 ++-- kuryr/tests/unit/binding/drivers/test_veth.py | 4 ++-- kuryr/tests/unit/binding/drivers/test_vlan.py | 4 ++-- requirements.txt | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kuryr/lib/binding/drivers/ipvlan.py b/kuryr/lib/binding/drivers/ipvlan.py index d7b4d046..a76e6dc8 100644 --- a/kuryr/lib/binding/drivers/ipvlan.py +++ b/kuryr/lib/binding/drivers/ipvlan.py @@ -17,7 +17,7 @@ from kuryr.lib.binding.drivers import utils KIND = 'ipvlan' # We use L2 to allow broadcast frames -IPVLAN_MODE_L2 = ifinfmsg.ifinfo.ipvlan_data.modes['IPVLAN_MODE_L2'] +IPVLAN_MODE_L2 = ifinfmsg.ifinfo.data_map['ipvlan'].modes['IPVLAN_MODE_L2'] def port_bind(endpoint_id, port, subnets, network=None, vm_port=None, diff --git a/kuryr/tests/unit/binding/drivers/test_ipvlan.py b/kuryr/tests/unit/binding/drivers/test_ipvlan.py index b668cc1e..1754ff97 100644 --- a/kuryr/tests/unit/binding/drivers/test_ipvlan.py +++ b/kuryr/tests/unit/binding/drivers/test_ipvlan.py @@ -28,9 +28,9 @@ class TestIpvlanDriver(base.TestCase): """Unit tests for nested IPVLAN driver""" @mock.patch('kuryr.lib.binding.drivers.utils._configure_container_iface') - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getattribute__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getattribute__', return_value=mock_create) - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getitem__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getitem__', return_value=mock_interface) def test_port_bind(self, mock_getitem, mock_getattribute, mock_configure_container_iface): diff --git a/kuryr/tests/unit/binding/drivers/test_macvlan.py b/kuryr/tests/unit/binding/drivers/test_macvlan.py index 11ad4096..20012ddf 100644 --- a/kuryr/tests/unit/binding/drivers/test_macvlan.py +++ b/kuryr/tests/unit/binding/drivers/test_macvlan.py @@ -28,9 +28,9 @@ class TestMacvlanDriver(base.TestCase): """Unit tests for nested MACVLAN driver""" @mock.patch('kuryr.lib.binding.drivers.utils._configure_container_iface') - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getattribute__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getattribute__', return_value=mock_create) - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getitem__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getitem__', return_value=mock_interface) def test_port_bind(self, mock_getitem, mock_getattribute, mock_configure_container_iface): diff --git a/kuryr/tests/unit/binding/drivers/test_utils.py b/kuryr/tests/unit/binding/drivers/test_utils.py index 333e32c4..96abfbc8 100644 --- a/kuryr/tests/unit/binding/drivers/test_utils.py +++ b/kuryr/tests/unit/binding/drivers/test_utils.py @@ -13,7 +13,7 @@ import ddt import mock from oslo_utils import uuidutils -import pyroute2.ipdb.interface +import pyroute2.ipdb.interfaces from pyroute2.netlink.rtnl import ifinfmsg from kuryr.lib.binding.drivers import utils @@ -104,7 +104,7 @@ class BindingDriversUtilsTest(base.TestCase): 'tenant_id': '51b66b97a12f42a990452967d2c555ac', 'updated_at': '2016-09-27T08:57:13'}] - fake_iface = mock.Mock(spec=pyroute2.ipdb.interface.Interface) + fake_iface = mock.Mock(spec=pyroute2.ipdb.interfaces.Interface) _set_mtu = mock.Mock() _set_address = mock.Mock() fake_iface.attach_mock(_set_mtu, 'set_mtu') diff --git a/kuryr/tests/unit/binding/drivers/test_veth.py b/kuryr/tests/unit/binding/drivers/test_veth.py index 46562f26..77ef64ed 100644 --- a/kuryr/tests/unit/binding/drivers/test_veth.py +++ b/kuryr/tests/unit/binding/drivers/test_veth.py @@ -30,9 +30,9 @@ class TestVethDriver(base.TestCase): @mock.patch('os.path.exists', return_value=True) @mock.patch('oslo_concurrency.processutils.execute', return_value=('fake_stdout', 'fake_stderr')) - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getattribute__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getattribute__', return_value=mock_create) - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getitem__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getitem__', return_value=mock_interface) def test_port_bind(self, mock_getitem, mock_getattribute, mock_execute, mock_path_exists): diff --git a/kuryr/tests/unit/binding/drivers/test_vlan.py b/kuryr/tests/unit/binding/drivers/test_vlan.py index d2a5ac1b..8e8083d0 100644 --- a/kuryr/tests/unit/binding/drivers/test_vlan.py +++ b/kuryr/tests/unit/binding/drivers/test_vlan.py @@ -28,9 +28,9 @@ class TestVlanDriver(base.TestCase): """Unit tests for nested vlan driver""" @mock.patch('kuryr.lib.binding.drivers.utils._configure_container_iface') - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getattribute__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getattribute__', return_value=mock_create) - @mock.patch('pyroute2.ipdb.interface.InterfacesDict.__getitem__', + @mock.patch('pyroute2.ipdb.interfaces.InterfacesDict.__getitem__', return_value=mock_interface) def test_port_bind(self, mock_getitem, mock_getattribute, mock_configure_container_iface): diff --git a/requirements.txt b/requirements.txt index ecbcf31d..23c4918a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,6 @@ oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=3.22.0 # Apache-2.0 oslo.utils>=3.20.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0 -pyroute2>=0.4.12 # Apache-2.0 (+ dual licensed GPL2) +pyroute2>=0.4.15 # Apache-2.0 (+ dual licensed GPL2) python-neutronclient>=5.1.0 # Apache-2.0 six>=1.9.0 # MIT