Remove unused "pxe switch macs" option from enroll

This was used to influence the "pxe" boot configuration during enrol but
we don't need it any more because we now set the "pxe" flag on all
candidate interfaces during enrol, and then we set it properly once the
full agent inspection data is in available.

Author: stevekeay

python/understack-workflows/tests/test_enroll_server.py

@@ -210,7 +210,6 @@ def test_enrol_happy_path_uses_real_ironic_workflow(mocker):
         ip_address="10.0.0.10",
         firmware_update=False,
         raid_configure=True,
-        pxe_switch_macs={"AA:BB:CC:DD:EE:FF"},
         old_password="old-password",
         external_cmdb_id="cmdb-1",
     )
@@ -387,7 +386,6 @@ def test_enrol_existing_failed_node_recovers_and_updates(mocker):
         ip_address="10.0.0.10",
         firmware_update=False,
         raid_configure=False,
-        pxe_switch_macs={"AA:BB:CC:DD:EE:FF"},
         old_password=None,
         external_cmdb_id="cmdb-1",
     )
@@ -520,9 +518,7 @@ def test_guess_pxe_interface_unknown_name_avoids_bmc_interface():
         ],
     )
 
-    assert enroll_server.guess_pxe_interfaces(device_info, {"AA:BB:CC:DD:EE:FF"}) == [
-        "NIC.Custom.9-1"
-    ]
+    assert enroll_server.guess_pxe_interfaces(device_info) == ["NIC.Custom.9-1"]
 
 
 def test_get_node_interfaces_parses_inventory(mocker):

python/understack-workflows/tests/test_pxe_port_heuristic.py

@@ -92,7 +92,6 @@ def test_connected_is_better():
 
 def test_connected_macs_picks_first():
     any_mac = "00:00:00:00:00:00"
-    pxe_mac = "11:22:33:44:55:66"
     x = "test"
     device_info = ChassisInfo(
         manufacturer=x,
@@ -117,44 +116,9 @@ def test_connected_macs_picks_first():
             InterfaceInfo("NIC.Slot.1-2", x, x, remote_switch_mac_address=any_mac),
         ],
     )
-    assert guess_pxe_interfaces(device_info, {pxe_mac}) == [
+    assert guess_pxe_interfaces(device_info) == [
         "NIC.Integrated.1-1",
         "NIC.Slot.1-1",
         "NIC.Integrated.1-2",
         "NIC.Slot.1-2",
     ]
-
-
-def test_connected_to_known_pxe_is_best():
-    any_mac = "00:00:00:00:00:00"
-    pxe_mac = "11:22:33:44:55:66"
-    x = "test"
-    device_info = ChassisInfo(
-        manufacturer=x,
-        model_number=x,
-        serial_number=x,
-        bmc_ip_address=x,
-        bios_version=x,
-        power_on=False,
-        memory_gib=0,
-        cpu=x,
-        interfaces=[
-            InterfaceInfo("iDRAC", x, x, remote_switch_mac_address=x),
-            InterfaceInfo("NIC.Embedded.1-1", x, x, remote_switch_mac_address=None),
-            InterfaceInfo("NIC.Embedded.1-1", x, x, remote_switch_mac_address=any_mac),
-            InterfaceInfo(
-                "NIC.Integrated.1-1", x, x, remote_switch_mac_address=any_mac
-            ),
-            InterfaceInfo(
-                "NIC.Integrated.1-2", x, x, remote_switch_mac_address=any_mac
-            ),
-            InterfaceInfo("NIC.Slot.1-1", x, x, remote_switch_mac_address=pxe_mac),
-            InterfaceInfo("NIC.Slot.1-2", x, x, remote_switch_mac_address=pxe_mac),
-        ],
-    )
-    assert guess_pxe_interfaces(device_info, {pxe_mac}) == [
-        "NIC.Slot.1-1",
-        "NIC.Slot.1-2",
-        "NIC.Integrated.1-1",
-        "NIC.Integrated.1-2",
-    ]

python/understack-workflows/understack_workflows/main/enroll_server.py

@@ -60,7 +60,6 @@ def main() -> None:
         ip_address=args.ip_address,
         old_password=args.old_password,
         firmware_update=args.firmware_update,
-        pxe_switch_macs=parse_maclist(str(args.pxe_switch_macs)),
         raid_configure=args.raid_configure,
         external_cmdb_id=args.external_cmdb_id,
     )
@@ -74,12 +73,10 @@ def enrol(
     ip_address: str,
     firmware_update: bool,
     raid_configure: bool,
-    pxe_switch_macs: set[str],
     old_password: str | None,
     external_cmdb_id: str | None = None,
 ) -> None:
     logger.info("Starting enrol workflow for bmc_ip_address=%s", ip_address)
-    logger.info("  pxe_switch_macs=%s", pxe_switch_macs)
 
     if external_cmdb_id:
         logger.info("  external_cmdb_id=%s", external_cmdb_id)
@@ -90,7 +87,7 @@ def enrol(
     if insufficient_lldp_data(device_info):
         device_info = power_on_and_wait(bmc, device_info)
 
-    pxe_interfaces = guess_pxe_interfaces(device_info, pxe_switch_macs)
+    pxe_interfaces = guess_pxe_interfaces(device_info)
     logger.info("Selected %s as PXE interfaces", pxe_interfaces)
 
     node = ironic_node.create_or_update(
@@ -341,12 +338,6 @@ def argument_parser():
         default="",
         help="External CMDB ID for RXDB integration",
     )
-    parser.add_argument(
-        "--pxe-switch-macs",
-        required=False,
-        default="",
-        help="Chassis MAC address of switches providing PXE network",
-    )
     return parser
 
 

python/understack-workflows/understack_workflows/pxe_port_heuristic.py

@@ -9,20 +9,15 @@
 DISQUALIFIED = ["DRAC", "ILO", "NIC.EMBEDDED"]
 
 
-def guess_pxe_interfaces(
-    device_info: ChassisInfo, pxe_switch_macs: set[str] | None = None
-) -> list[str]:
+def guess_pxe_interfaces(device_info: ChassisInfo) -> list[str]:
     """First 8 interface names, most probable PXE interfaces first."""
-    if pxe_switch_macs is None:
-        pxe_switch_macs = set()
-
     candidate_interfaces = {i for i in device_info.interfaces if not disqualified(i)}
 
     names = [
         i.name
         for i in sorted(
             candidate_interfaces,
-            key=lambda i: likelihood(i, pxe_switch_macs),
+            key=lambda i: likelihood(i),
         )
     ]
 
@@ -33,21 +28,16 @@ def disqualified(interface: InterfaceInfo) -> bool:
     return any(x in interface.name.upper() for x in DISQUALIFIED)
 
 
-def likelihood(interface: InterfaceInfo, pxe_switch_macs: set[str]) -> list[bool | str]:
+def likelihood(interface: InterfaceInfo) -> list[bool | str]:
     """A value that is sortable.  Lower is better."""
     return [
         # python sort order: false is "better" than true
-        not connected_to_known_pxe_switch(interface, pxe_switch_macs),
         not connected_to_any_switch(interface),
         nic_port_number(interface),
         interface.name,  # tiebreaker
     ]
 
 
-def connected_to_known_pxe_switch(interface: InterfaceInfo, pxe_switch_macs) -> bool:
-    return interface.remote_switch_mac_address in pxe_switch_macs
-
-
 def connected_to_any_switch(interface: InterfaceInfo) -> bool:
     return interface.remote_switch_mac_address is not None