Merge "Ignore IPMI Address for IPMI Bridged nodes"

ironic_inspector/test/test_utils.py

@@ -171,6 +171,12 @@ class TestGetIpmiAddress(base.BaseTest):
         ip = utils.get_ipmi_address(node)
         self.assertEqual(ip, '192.168.1.1')
 
+    def test_ipmi_bridging_enabled(self):
+        node = mock.Mock(spec=['driver_info', 'uuid'],
+                         driver_info={'ipmi_address': 'www.example.com',
+                                      'ipmi_bridging': 'single'})
+        self.assertIsNone(utils.get_ipmi_address(node))
+
 
 class TestCapabilities(unittest.TestCase):
 

ironic_inspector/utils.py

@@ -157,6 +157,10 @@ def get_auth_strategy():
 
 def get_ipmi_address(node):
     ipmi_fields = ['ipmi_address'] + CONF.ipmi_address_fields
+    # NOTE(sambetts): IPMI Address is useless to us if bridging is enabled so
+    # just ignore it and return None
+    if node.driver_info.get("ipmi_bridging", "no") != "no":
+        return
     for name in ipmi_fields:
         value = node.driver_info.get(name)
         if value: