Fix up switch name inspector plugin

Author: JohnGarbutt

stackhpc_inspector_plugins/plugins/ib_physnet.py

@@ -54,6 +54,9 @@ def __call__(self, task, inventory, plugin_data):
 
         for interface in inventory['interfaces']:
             if interface['name'] not in plugin_data['all_interfaces']:
+                LOG.debug("No processed data for interface %s on node %s, "
+                          "skipping physical network processing.",
+                          interface['name'], task.node.uuid)
                 continue
 
             mac_address = interface['mac_address']
@@ -70,8 +73,7 @@ def __call__(self, task, inventory, plugin_data):
             if phys_network is None:
                 LOG.debug("Skipping physical network processing for interface "
                           "%s on node %s - no physical network mapping.",
-                          mac_address,
-                          task.node.uuid)
+                          mac_address, task.node.uuid)
                 continue
 
             if getattr(port, 'physical_network', '') != phys_network:
@@ -135,18 +137,32 @@ def get_physical_network(self, interface, plugin_data):
         :param introspection_data: Introspection data.
         :returns: The physical network to set, or None.
         """
-        # Check if LLDP data was already processed by lldp_basic plugin
-        # which stores data in 'all_interfaces'
-        iface_name = interface['name']
-        proc_data = plugin_data['all_interfaces'][iface_name]
-        if 'parsed_lldp' not in proc_data:
+        # Check if LLDP data was already processed
+        if 'parsed_lldp' not in plugin_data:
+            LOG.error("No LLDP data, parse_lldp hook is required. ")
             return
 
-        lldp_proc = proc_data['parsed_lldp']
+        # check we have data for this interface
+        iface_name = interface['name']
+        lldp_proc = plugin_data['parsed_lldp'].get(iface_name)
+        if not lldp_proc:
+            LOG.debug("No LLDP data for interface %s", iface_name)
+            return
 
         # Switch system name mapping.
         switch_sys_name = lldp_proc.get(lldp_parsers.LLDP_SYS_NAME_NM)
-        if switch_sys_name:
-            mapping = self._get_switch_sys_name_mapping()
-            if switch_sys_name in mapping:
-                return mapping[switch_sys_name]
+        if not switch_sys_name:
+            LOG.debug("No switch system name in LLDP data for interface %s",
+                      iface_name)
+            return
+
+        mapping = self._get_switch_sys_name_mapping()
+        if switch_sys_name not in mapping:
+            LOG.debug("No config set for switch system name %s for "
+                      "interface %s", switch_sys_name, iface_name)
+            return
+
+        LOG.debug("Interface %s connected to switch with system name "
+                  "%s, physnet %s", iface_name, switch_sys_name,
+                  mapping[switch_sys_name])
+        return mapping[switch_sys_name]

stackhpc_inspector_plugins/tests/unit/test_plugins_ib_physnet.py

@@ -39,9 +39,6 @@
     'ipv6_address': 'fe80:5054::',
     'client_id': ('ff:00:00:00:00:00:02:00:00:02:c9:00:7c:fe:'
                   '90:03:00:3a:4b:0a'),
-    'parsed_lldp': {
-        'switch_system_name': 'switch-1',
-    }
 }
 
 _INTERFACE_3 = {
@@ -56,7 +53,8 @@
 }
 
 _PLUGIN_DATA = {
-    'all_interfaces': {'em0': _INTERFACE_1, 'em1': _INTERFACE_2}
+    'all_interfaces': {'em0': _INTERFACE_1, 'em1': _INTERFACE_2},
+    'parsed_lldp': {'em1': {'switch_system_name': 'switch-1'}},
 }
 
 
@@ -106,7 +104,7 @@ def setUp(self):
         self.plugin_data = _PLUGIN_DATA
 
     @mock.patch.object(objects.Port, 'list_by_node_id', autospec=True)
-    def test_physical_network(self, mock_list_by_nodeid):
+    def test_sys_name_success(self, mock_list_by_nodeid):
         sys_name_mapping = 'switch-1:ibphysnet,switch-2:physnet2'
         CONF.set_override('switch_sys_name_mapping', sys_name_mapping,
                           group='port_physnet')
@@ -130,6 +128,32 @@ def test_physical_network(self, mock_list_by_nodeid):
             self.assertEqual(port2.physical_network, 'ibphysnet')
             self.assertIsNone(port1.physical_network)
 
+    @mock.patch.object(objects.Port, 'list_by_node_id', autospec=True)
+    def test_sys_name_success_no_data(self, mock_list_by_nodeid):
+        sys_name_mapping = 'switch-1:ibphysnet,switch-2:physnet2'
+        CONF.set_override('switch_sys_name_mapping', sys_name_mapping,
+                          group='port_physnet')
+        del _PLUGIN_DATA['parsed_lldp']
+        with task_manager.acquire(self.context, self.node.id) as task:
+            port1 = obj_utils.create_test_port(self.context,
+                                               address='11:11:11:11:11:11',
+                                               node_id=self.node.id)
+            port2 = obj_utils.create_test_port(
+                self.context, id=988,
+                uuid='2be26c0b-03f2-4d2e-ae87-c02d7f33c781',
+                address='22:22:22:22:22:22', node_id=self.node.id)
+            ports = [port1, port2]
+
+            mock_list_by_nodeid.return_value = ports
+
+            ib_physnet.SystemNamePhysnetHook().__call__(
+                task, self.inventory, self.plugin_data)
+
+            port1.refresh()
+            port2.refresh()
+            self.assertIsNone(port2.physical_network)
+            self.assertIsNone(port1.physical_network)
+
     def parse(self, mapping_list):
         return ib_physnet.parse_mappings(mapping_list)