Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,18 @@ def __call__(self, task, inventory, plugin_data):


def _parse_plugin_data(plugin_data: dict) -> list[InspectedPort]:
# The parse-lldp hook only populates parsed_lldp when at least one
# interface reports usable LLDP TLVs. Likewise, validate-interfaces
# populates all_interfaces. Both may be absent when a node returns no
# LLDP data (e.g. switch not emitting LLDP, ports not yet configured).
# Read defensively so the caller's "no LLDP data" guard handles it,
# rather than failing inspection with a KeyError.
parsed_lldp = plugin_data.get("parsed_lldp") or {}
all_interfaces = plugin_data.get("all_interfaces") or {}

mac = {
interface["name"]: interface["mac_address"]
for interface in plugin_data["all_interfaces"].values()
for interface in all_interfaces.values()
}

return [
Expand All @@ -87,7 +96,7 @@ def _parse_plugin_data(plugin_data: dict) -> list[InspectedPort]:
switch_chassis_id=str(lldp["switch_chassis_id"]).lower(),
switch_port_id=str(lldp["switch_port_id"]),
)
for name, lldp in plugin_data["parsed_lldp"].items()
for name, lldp in parsed_lldp.items()
]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,64 @@ def test_secondary_network_port_has_pxe_disabled(mocker, caplog):
mock_port.save.assert_called()


def test_missing_parsed_lldp_does_not_raise(mocker, caplog):
"""A node with no LLDP data should be handled gracefully.

When the parse-lldp hook produces no data, plugin_data has no
'parsed_lldp' key. The hook must not raise KeyError; it should log
and return without touching ports or traits.
"""
caplog.set_level(logging.DEBUG)

mock_context = mocker.Mock()
mock_node = mocker.Mock(id=1234, traits=mocker.Mock())
mock_task = mocker.Mock(node=mock_node, context=mock_context)

ports = mocker.patch(
"ironic_understack.hooks.inspect_hook_update_baremetal_ports.ironic_ports_for_node",
)
trait_create = mocker.patch(
"ironic_understack.hooks.inspect_hook_update_baremetal_ports.objects.TraitList.create"
)

# plugin_data with all_interfaces but NO parsed_lldp key
plugin_data = {"all_interfaces": _PLUGIN_DATA["all_interfaces"]}

InspectHookUpdateBaremetalPorts().__call__(mock_task, _INVENTORY, plugin_data)

# No ports fetched, no traits set, no exception raised
ports.assert_not_called()
trait_create.assert_not_called()
assert "No LLDP data" in caplog.text


def test_empty_parsed_lldp_does_not_raise(mocker, caplog):
"""An empty parsed_lldp dict should also be handled gracefully."""
caplog.set_level(logging.DEBUG)

mock_context = mocker.Mock()
mock_node = mocker.Mock(id=1234, traits=mocker.Mock())
mock_task = mocker.Mock(node=mock_node, context=mock_context)

ports = mocker.patch(
"ironic_understack.hooks.inspect_hook_update_baremetal_ports.ironic_ports_for_node",
)
trait_create = mocker.patch(
"ironic_understack.hooks.inspect_hook_update_baremetal_ports.objects.TraitList.create"
)

plugin_data = {
"all_interfaces": _PLUGIN_DATA["all_interfaces"],
"parsed_lldp": {},
}

InspectHookUpdateBaremetalPorts().__call__(mock_task, _INVENTORY, plugin_data)

ports.assert_not_called()
trait_create.assert_not_called()
assert "No LLDP data" in caplog.text


def test_node_traits_updated(mocker, caplog):
caplog.set_level(logging.DEBUG)

Expand Down
Loading