openstack/deb-neutron
Code Issues Proposed changes

Merge "Add IPLink class to Windows ip_lib implementation"

Browse Source
This commit is contained in:
Jenkins
2017-02-02 20:31:52 +00:00
committed by Gerrit Code Review
parent 0e71248955 18e2e2def5
commit 7a4fc0c07a
3 changed files with 94 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
neutron/tests/unit/agent/windows/test_ip_lib.py
View File

@@ -43,8 +43,8 @@ class TestIpWrapper(base.BaseTestCase):
mock.sentinel.dev2]
ret = ip_lib.IPWrapper().get_devices()
self.assertEqual(mock.sentinel.dev1, ret[0].device_name)
self.assertEqual(mock.sentinel.dev2, ret[1].device_name)
self.assertEqual(mock.sentinel.dev1, ret[0].name)
self.assertEqual(mock.sentinel.dev2, ret[1].name)
@mock.patch('netifaces.interfaces')
def test_get_devices_error(self, mock_interfaces):
@@ -57,38 +57,71 @@ class TestIpWrapper(base.BaseTestCase):
class TestIpDevice(base.BaseTestCase):
@mock.patch('netifaces.ifaddresses')
def test_device_has_ip(self, mock_netifaces):
def test_read_ifaddresses(self, mock_netifaces):
mock_address = {'addr': mock.sentinel.fake_addr}
mock_netifaces.return_value = {netifaces.AF_INET: [mock_address]}
ret = ip_lib.IPDevice("fake_dev").device_has_ip(
mock.sentinel.fake_addr)
ret = ip_lib.IPDevice("fake_dev").read_ifaddresses()
self.assertTrue(ret)
@mock.patch('netifaces.ifaddresses')
def test_device_has_ip_false(self, mock_netifaces):
def test_read_ifaddresses_no_ip(self, mock_netifaces):
mock_netifaces.return_value = {}
ret = ip_lib.IPDevice("fake_dev").device_has_ip(
mock.sentinel.fake_addr)
ret = ip_lib.IPDevice("fake_dev").read_ifaddresses()
self.assertFalse(ret)
@mock.patch('netifaces.ifaddresses')
def test_device_has_ip_error(self, mock_netifaces):
def test_read_ifaddresses_ip_error(self, mock_netifaces):
mock_netifaces.side_effect = OSError
ret = ip_lib.IPDevice("fake_dev").device_has_ip(
mock.sentinel.fake_addr)
ret = ip_lib.IPDevice("fake_dev").read_ifaddresses()
self.assertFalse(ret)
@mock.patch('netifaces.ifaddresses')
def test_device_not_found(self, mock_netifaces):
def test_read_faddresses_not_found(self, mock_netifaces):
mock_netifaces.side_effect = ValueError
ret = ip_lib.IPDevice("fake_dev").device_has_ip(
mock.sentinel.fake_addr)
ret = ip_lib.IPDevice("fake_dev").read_ifaddresses()
self.assertFalse(ret)
def test_device_has_ip(self):
mock_address = {'addr': mock.sentinel.fake_addr}
ip_device = ip_lib.IPDevice("fake_dev")
with mock.patch.object(ip_device, "read_ifaddresses", return_value=(
{netifaces.AF_INET: [mock_address]})):
ret = ip_device.device_has_ip(mock.sentinel.fake_addr)
self.assertTrue(ret)
def test_device_has_ip_false(self):
ip_device = ip_lib.IPDevice("fake_dev")
with mock.patch.object(ip_device, "read_ifaddresses", return_value={}):
ret = ip_device.device_has_ip(mock.sentinel.fake_addr)
self.assertFalse(ret)
def test_device_has_ip_error(self):
ip_device = ip_lib.IPDevice("fake_dev")
with mock.patch.object(ip_device, "read_ifaddresses",
return_value=None):
ret = ip_device.device_has_ip(mock.sentinel.fake_addr)
self.assertFalse(ret)
class TestIPLink(base.BaseTestCase):
def setUp(self):
super(TestIPLink, self).setUp()
parent = ip_lib.IPDevice("fake_dev")
self.ip_link = ip_lib.IPLink(parent)
self.ip_link._parent.read_ifaddresses = mock.Mock()
def test_address(self):
mock_address = {'addr': mock.sentinel.fake_addr}
self.ip_link._parent.read_ifaddresses.return_value = {
netifaces.AF_LINK: [mock_address]}
self.assertEqual([mock_address['addr']], self.ip_link.address)
def test_address_no_address(self):
self.ip_link._parent.read_ifaddresses.return_value = {
netifaces.AF_LINK: []}
self.assertEqual([], self.ip_link.address)
def test_address_error(self):
self.ip_link._parent.read_ifaddresses.return_value = None
self.assertFalse(self.ip_link.address)