Merge "os_net_config should map nics that are down if nic is in mapping file"

2 files changed, 40 insertions, 7 deletions

diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py
index afe63b5..1199bb2 100644
--- a/os_net_config/tests/test_objects.py
+++ b/os_net_config/tests/test_objects.py
@@ -913,6 +913,12 @@ class TestNicMapping(base.TestCase):
             return nics
         self.stubs.Set(utils, 'ordered_active_nics', dummy_ordered_active_nics)
 
+    def _stub_available_nics(self, nics):
+        def dummy_ordered_available_nics():
+            return nics
+        self.stubs.Set(utils, 'ordered_available_nics',
+                       dummy_ordered_available_nics)
+
     def test_mapped_nics_default(self):
         self._stub_active_nics(['em1', 'em2'])
         expected = {'nic1': 'em1', 'nic2': 'em2'}
@@ -920,43 +926,56 @@ class TestNicMapping(base.TestCase):
 
     def test_mapped_nics_mapped(self):
         self._stub_active_nics(['em1', 'em2'])
+        self._stub_available_nics(['em1', 'em2'])
         mapping = {'nic1': 'em2', 'nic2': 'em1'}
         expected = {'nic1': 'em2', 'nic2': 'em1'}
         self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
 
     def test_mapped_nics_mapped_partial(self):
         self._stub_active_nics(['em1', 'em2', 'em3', 'em4'])
+        self._stub_available_nics(['em1', 'em2', 'em3', 'em4'])
         mapping = {'nic1': 'em2', 'nic2': 'em1'}
         expected = {'nic1': 'em2', 'nic2': 'em1', 'nic3': 'em3', 'nic4': 'em4'}
         self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
 
     def test_mapped_nics_mapped_partial_reordered(self):
         self._stub_active_nics(['em1', 'em2', 'em3', 'em4'])
+        self._stub_available_nics(['em1', 'em2', 'em3', 'em4'])
         mapping = {'nic1': 'em1', 'nic2': 'em3'}
         expected = {'nic1': 'em1', 'nic2': 'em3', 'nic4': 'em4'}
         self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
 
     def test_mapped_nics_mapped_unnumbered(self):
         self._stub_active_nics(['em1', 'em2', 'em3', 'em4'])
+        self._stub_available_nics(['em1', 'em2', 'em3', 'em4'])
         mapping = {'John': 'em1', 'Paul': 'em2', 'George': 'em3'}
         expected = {'John': 'em1', 'Paul': 'em2', 'George': 'em3',
                     'nic4': 'em4'}
         self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
 
     def test_mapped_nics_map_error_notactive(self):
-        self._stub_active_nics(['em1', 'em2'])
-        mapping = {'nic1': 'em3', 'nic2': 'em1'}
-        expected = {'nic2': 'em1'}
+        self._stub_active_nics(['em2'])
+        self._stub_available_nics(['em1', 'em2', 'em3'])
+        mapping = {'nic2': 'em1'}
+        expected = {'nic1': 'em2', 'nic2': 'em1'}
         self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
 
     def test_mapped_nics_map_error_duplicate(self):
         self._stub_active_nics(['em1', 'em2'])
+        self._stub_available_nics(['em1', 'em2'])
         mapping = {'nic1': 'em1', 'nic2': 'em1'}
         err = self.assertRaises(objects.InvalidConfigException,
                                 objects._mapped_nics, nic_mapping=mapping)
         expected = 'em1 already mapped, check mapping file for duplicates'
         self.assertIn(expected, six.text_type(err))
 
+    def test_mapped_nics_map_invalid_nic(self):
+        self._stub_active_nics(['em1'])
+        self._stub_available_nics(['em1', 'em2'])
+        mapping = {'nic1': 'em1', 'nic2': 'foo'}
+        expected = {'nic1': 'em1'}
+        self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
+
     def test_mapped_nics_map_mac(self):
         def dummy_interface_mac(name):
             mac_map = {'em1': '12:34:56:78:9a:bc',
@@ -964,10 +983,24 @@ class TestNicMapping(base.TestCase):
             return mac_map[name]
         self.stubs.Set(utils, 'interface_mac', dummy_interface_mac)
         self._stub_active_nics(['em1', 'em2'])
+        self._stub_available_nics(['em1', 'em2'])
         mapping = {'nic1': '12:34:56:de:f0:12', 'nic2': '12:34:56:78:9a:bc'}
         expected = {'nic1': 'em2', 'nic2': 'em1'}
         self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
 
+    def test_mapped_nics_map_invalid_mac(self):
+        def dummy_interface_mac(name):
+            mac_map = {'em1': '12:34:56:78:9a:bc',
+                       'em2': '12:34:56:de:f0:12'}
+            return mac_map[name]
+
+        self.stubs.Set(utils, 'interface_mac', dummy_interface_mac)
+        self._stub_active_nics(['em1', 'em2'])
+        self._stub_available_nics(['em1', 'em2'])
+        mapping = {'nic1': '12:34:56:de:f0:12', 'nic2': 'aa:bb:cc:dd:ee:ff'}
+        expected = {'nic1': 'em2'}
+        self.assertEqual(expected, objects._mapped_nics(nic_mapping=mapping))
+
     def test_mapped_nics_no_active(self):
         self._stub_active_nics([])
         expected = {}
diff --git a/os_net_config/tests/test_utils.py b/os_net_config/tests/test_utils.py
index 5a8b6af..dcd6045 100644
--- a/os_net_config/tests/test_utils.py
+++ b/os_net_config/tests/test_utils.py
@@ -84,9 +84,9 @@ class TestUtils(base.TestCase):
         tmpdir = tempfile.mkdtemp()
         self.stubs.Set(utils, '_SYS_CLASS_NET', tmpdir)
 
-        def test_is_active_nic(interface_name):
+        def test_is_available_nic(interface_name, check_active):
             return True
-        self.stubs.Set(utils, '_is_active_nic', test_is_active_nic)
+        self.stubs.Set(utils, '_is_available_nic', test_is_available_nic)
 
         for nic in ['a1', 'em1', 'em2', 'eth2', 'z1',
                     'enp8s0', 'enp10s0', 'enp1s0f0']:
@@ -214,9 +214,9 @@ class TestUtils(base.TestCase):
         tmpdir = tempfile.mkdtemp()
         self.stubs.Set(utils, '_SYS_CLASS_NET', tmpdir)
 
-        def test_is_active_nic(interface_name):
+        def test_is_available_nic(interface_name, check_active):
             return True
-        self.stubs.Set(utils, '_is_active_nic', test_is_active_nic)
+        self.stubs.Set(utils, '_is_available_nic', test_is_available_nic)
 
         for nic in ['a1', 'em1', 'em2', 'eth2', 'z1',
                     'enp8s0', 'enp10s0', 'enp1s0f0']: