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
1 change: 0 additions & 1 deletion python/understack-workflows/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies = [
bmc-kube-password = "understack_workflows.main.bmc_display_password:main"
bmc-password = "understack_workflows.main.print_bmc_password:main"
enroll-server = "understack_workflows.main.enroll_server:main"
get-raid-devices = "understack_workflows.main.get_raid_devices:main"
netapp-configure-interfaces = "understack_workflows.main.netapp_configure_net:main"
netapp-create-svm = "understack_workflows.main.netapp_create_svm:main"
openstack-oslo-event = "understack_workflows.main.openstack_oslo_event:main"
Expand Down
13 changes: 12 additions & 1 deletion python/understack-workflows/tests/test_enroll_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def make_node_inventory(
interfaces: list[dict] | None = None,
connected_interface_names: list[str] | None = None,
serial_number: str = "FL6PC14",
storage_controllers: list[dict] | None = None,
) -> dict:
"""Build a realistic Ironic node inventory dict, suitable for mocking."""
if interfaces is None:
Expand All @@ -56,6 +57,7 @@ def make_node_inventory(
return {
"inventory": {
"interfaces": interfaces,
"storage_controllers": storage_controllers or [],
"system_vendor": {
"product_name": "PowerEdge R7615",
"serial_number": serial_number,
Expand Down Expand Up @@ -179,6 +181,15 @@ def test_enrol_happy_path_uses_virtual_media_inspect_and_flips_back(mocker):
fake_bmc = make_bmc(mocker, fake_sushy=make_raid_hardware())
inventory = make_node_inventory(
connected_interface_names=["NIC.Integrated.1-1", "NIC.Integrated.1-2"],
storage_controllers=[
{
"id": "RAID.Integrated.1-1",
"drives": [
{"id": "Disk1", "size": 479559942144},
{"id": "Disk2", "size": 479559942144},
],
}
],
)
# port-enroll-config hook has run during agent inspection and flagged
# pxe_enabled on LLDP-connected ports. port-bios-name (OOB) stamped
Expand Down Expand Up @@ -305,7 +316,7 @@ def test_enrol_happy_path_uses_virtual_media_inspect_and_flips_back(mocker):
{"interface": "raid", "step": "create_configuration"},
],
runbook=None,
disable_ramdisk=True,
disable_ramdisk=False,
),
call(
created_node.uuid,
Expand Down
Loading
Loading