x/deb-os-net-config
Code Issues Proposed changes

Merge "Add warning for no active nics"

Browse Source
This commit is contained in:
Jenkins 2016-04-22 10:52:29 +00:00 committed by Gerrit Code Review
commit 60475755e3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_net_config/objects.py
View File

@ -98,6 +98,8 @@ def _numbered_nics(nic_mapping=None):
_NUMBERED_NICS[nic_alias] = nic_mapped _NUMBERED_NICS[nic_alias] = nic_mapped
logger.info("%s mapped to: %s" % (nic_alias, nic_mapped)) logger.info("%s mapped to: %s" % (nic_alias, nic_mapped))
if not _NUMBERED_NICS:
logger.warning('No active nics found.')
return _NUMBERED_NICS return _NUMBERED_NICS

6
os_net_config/tests/test_objects.py
View File

@ -569,3 +569,9 @@ class TestNumberedNicsMapping(base.TestCase):
mapping = {'nic1': '12:34:56:de:f0:12', 'nic2': '12:34:56:78:9a:bc'} mapping = {'nic1': '12:34:56:de:f0:12', 'nic2': '12:34:56:78:9a:bc'}
expected = {'nic1': 'em2', 'nic2': 'em1'} expected = {'nic1': 'em2', 'nic2': 'em1'}
self.assertEqual(expected, objects._numbered_nics(nic_mapping=mapping)) self.assertEqual(expected, objects._numbered_nics(nic_mapping=mapping))
def test_numbered_nics_no_active(self):
self._stub_active_nics([])
expected = {}
# This only emits a warning, so it should still work
self.assertEqual(expected, objects._numbered_nics())