openstack/astara-appliance
Code Issues Proposed changes

Ensure interface cache up to date

Browse Source 
The appliance server parses and caches the systems network interfaces
the first time it updates them, and never refreshes the cache. When
a new router interface is added, the appliance errors because its
interface cache has no idea about the NIC that corresponds to the
router interface.  This ensures we recreate this mapping anytime we
need it.

Change-Id: Iaff5a84a674d9089447bbdc8dc471f3d75a79af6
Closes-bug: #1531651
This commit is contained in:
Adam Gandelman 2016-01-07 11:17:55 -08:00
parent d5014bfdc6
commit adeaab79c8
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
astara_router/drivers/ip.py
View File

@ -51,10 +51,9 @@ class IPManager(base.Manager):
def ensure_mapping(self):
"""
Creates a mapping of generic interface names (e.g., ge0, ge1) to
physical interface names (eth1, eth2) if one does not already exist.
physical interface names (eth1, eth2).
"""
if not self.host_mapping:
self.get_interfaces()
self.get_interfaces()
def get_interfaces(self):
"""

3
releasenotes/notes/ensure_interface_cache_refreshed-57ce5b0637282b60.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- Bug `1531651 <https://bugs.launchpad.net/astara/+bug/1531651/>`_ \- Fixes a stale interface cache from preventing additional router interfaces from being attached

42
test/unit/drivers/test_ip.py
View File

@ -93,7 +93,7 @@ class IPTestCase(TestCase):
self.mock_execute.assert_has_calls(
[mock.call(['/sbin/ip', 'addr', 'show'])])
def test_ensure_mapping_uninitialized(self):
def test_ensure_mapping(self):
attr = 'get_interfaces'
with mock.patch.object(ip.IPManager, attr) as get_ifaces:
mgr = ip.IPManager()
@ -101,29 +101,23 @@ class IPTestCase(TestCase):
get_ifaces.assert_called_once_with()
def test_ensure_mapping_initialized(self):
attr = 'get_interfaces'
with mock.patch.object(ip.IPManager, attr) as get_ifaces:
mgr = ip.IPManager()
mgr.host_mapping['em0'] = 'ge0'
mgr.ensure_mapping()
self.assertEqual(get_ifaces.call_count, 0)
def test_is_valid(self):
@mock.patch.object(ip.IPManager, 'ensure_mapping')
def test_is_valid(self, mock_ensure):
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
self.assertTrue(mgr.is_valid('ge0'))
def test_generic_to_host(self):
@mock.patch.object(ip.IPManager, 'ensure_mapping')
def test_generic_to_host(self, mock_ensure):
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
self.assertEqual(mgr.generic_to_host('ge0'), 'em0')
self.assertIsNone(mgr.generic_to_host('ge1'))
def test_host_to_generic(self):
@mock.patch.object(ip.IPManager, 'ensure_mapping')
def test_host_to_generic(self, ensure_mapping):
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
@ -144,12 +138,12 @@ class IPTestCase(TestCase):
iface = mock.Mock()
iface.ifname = 'ge0'
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
mgr.up(iface)
attr = 'ensure_mapping'
with mock.patch.object(ip.IPManager, attr) as ensure:
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
mgr.up(iface)
self.mock_execute.assert_has_calls(
[mock.call(['/sbin/ip', 'link', 'set', 'em0', 'up'], 'sudo')])
@ -157,11 +151,13 @@ class IPTestCase(TestCase):
iface = mock.Mock()
iface.ifname = 'ge0'
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
attr = 'ensure_mapping'
with mock.patch.object(ip.IPManager, attr) as ensure:
mgr = ip.IPManager()
mgr.host_mapping = {'em0': 'ge0'}
mgr.generic_mapping = {'ge0': 'em0'}
mgr.down(iface)
mgr.down(iface)
self.mock_execute.assert_has_calls(
[mock.call(['/sbin/ip', 'link', 'set', 'em0', 'down'], 'sudo')])