add support for Extreme Networks AP3825i

Re-using most functions from ws_ap3710i until we can do a proper split.

extremeflash/__main__.py

@@ -7,6 +7,7 @@
 import serial
 
 from .ws_ap3710i import main as main_ap3710i
+from .ws_ap3825i import main as main_ap3825i
 
 
 def test_serial_port(potential_serial_port):
@@ -93,7 +94,7 @@ def run():
         "--model",
         action="store",
         type=str,
-        choices={"AP3710"},
+        choices={"AP3710", "AP3825"},
         default="AP3710",
         help="The model of the Extreme Networks or Enterasys access point that should be flashed.",
         required=False,
@@ -116,6 +117,8 @@ def run():
     main = None
     if args.model == "AP3710":
         main = main_ap3710i
+    elif args.model == "AP3825":
+        main = main_ap3825i
 
     main(serial_port, args.initramfs, args.image, args.local_ip, args.ap_ip, args.dryrun)
 

extremeflash/ws_ap3710i.py

@@ -178,6 +178,11 @@ def is_kernel_booting(line):
         # https://github.com/u-boot/u-boot/blob/8c39999acb726ef083d3d5de12f20318ee0e5070/boot/image-fit.c#L2079
         return True
 
+    # TODO: improve this section. Mixing usages here.
+    if "[    0.000000] Linux version " in line:
+        # kernel is booting
+        return True
+
     return False
 
 

extremeflash/ws_ap3825i.py

@@ -0,0 +1,237 @@
+#!/usr/bin/env python3
+#
+#     Copyright (C) 2023 Grische
+#
+#     This program is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, version 3.
+#
+#     This program is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-only
+"""This tool allows flashing Enterasys WS-AP3825i access points fully automatically, using OpenWRT's initramfs image."""
+import ipaddress
+import logging
+import pathlib
+import re
+import time
+from threading import Thread
+from typing import Optional
+
+import serial
+
+from .tftp_server import TftpServer
+from . import ws_ap3710i
+from .ws_ap3710i import (
+    boot_set_ips,
+    boot_wait_for_brlan,
+    bootup_interrupt,
+    bootup_login,
+    bootup_login_verification,
+    debug_serial,
+    is_kernel_booting,
+    keep_logging_until_reboot,
+    post_cleanup,
+    readline_from_serial,
+    setting_up_ips,
+    start_ssh,
+    write_to_serial,
+)
+
+#  See .ws_ap3710i file for implementation details
+
+def bootup_set_boot_openwrt(ser: serial.Serial):
+    if not ws_ap3710i.event_keep_serial_active.is_set():
+        return
+    ser.write(b"printenv\n")
+    time.sleep(1)
+    printenv_return = ser.read(ser.in_waiting).decode("ascii")
+    debug_serial(printenv_return)
+
+    if "MODEL=AP3825i" not in printenv_return:
+        model = re.search(r"MODEL=(.*)\r\n", printenv_return)
+        raise RuntimeWarning(
+            f"Unexpected Model {None if model is None else model.group(1)} found. Aborting to not harm device."
+        )
+
+    boot_openwrt_params = (
+        b"cp.b 0xEC000000 0x2000000 0x2000000; interrupts off; bootm start 0x2000000; bootm loados; "
+        b"fdt resize; fdt boardsetup; fdt chosen; bootm prep; bootm go;"
+    )
+    # TODO: Use better parameters
+    # https://forum.darmstadt.freifunk.net/t/flashing-of-the-extreme-networks-ws-ap3825i/923
+
+    if "boot_openwrt" in printenv_return:
+        logging.debug("Found existing U-Boot boot_openwrt parameter. Verifying.")
+        existing_boot_openwrt_params = re.search(r"boot_openwrt=(.*)\r\n", printenv_return)
+        if not existing_boot_openwrt_params:
+            raise RuntimeError("Unable to parse detected boot_openwrt paramter")
+
+        if boot_openwrt_params.decode("ascii") != existing_boot_openwrt_params.group(1):
+            logging.warning(f"Overwriting unexpected param for 'boot_openwrt': {existing_boot_openwrt_params}")
+        else:
+            logging.debug("Existing U-Boot boot_openwrt parameter looks good.")
+
+    if True:
+        logging.info("Did not find boot_openwrt in U-Boot parameters. Setting it.")
+        write_to_serial(ser, b'setenv boot_openwrt "' + boot_openwrt_params + b'"\n')
+        time.sleep(0.5)
+
+        write_to_serial(ser, b'setenv bootcmd "run boot_openwrt"\n')
+        time.sleep(0.5)
+
+        if ws_ap3710i.DRYRUN:
+            logging.info("dryrun: Skipping saveenv")
+            return
+
+        ser.write(b"saveenv\n")
+        time.sleep(2)
+        saveenv_return = ser.read(ser.in_waiting).decode("ascii")
+        debug_serial(saveenv_return)
+
+        if "Writing to Flash" not in saveenv_return:
+            raise RuntimeError("saveenv did not successfully write to flash")
+
+
+def boot_via_tftp(
+    ser: serial.Serial,
+    tftp_ip: ipaddress.IPv4Interface | ipaddress.IPv6Interface,
+    tftp_file: str,
+    new_ap_ip: ipaddress.IPv4Interface | ipaddress.IPv6Interface,
+):
+    new_ap_ip_str = str(new_ap_ip.ip).encode("ascii")
+    new_ap_netmask_str = str(new_ap_ip.netmask).encode("ascii")
+    tftp_ip_str = str(tftp_ip.ip).encode("ascii")
+
+    write_to_serial(ser, b"setenv ipaddr " + new_ap_ip_str + b"\n")
+    write_to_serial(ser, b"setenv netmask " + new_ap_netmask_str + b"\n")
+    write_to_serial(ser, b"setenv serverip " + tftp_ip_str + b"\n")
+    write_to_serial(ser, b"setenv gatewayip " + tftp_ip_str + b"\n")
+    write_to_serial(ser, b"tftpboot 0x2000000 " + tftp_ip_str + b":" + tftp_file.encode("ascii") + b"\n")
+    # wait until TFTP transfer is complete
+    while ws_ap3710i.event_keep_serial_active.is_set():
+        line = readline_from_serial(ser)
+
+        if "Bytes transferred" in line:
+            time.sleep(1)
+            break
+    # Note: We must step through the `bootm` process manually to avoid fdt relocation.
+    # https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=7e614820a89208c4e91a3a5f9de07a5402accdaa
+    write_to_serial(ser, b"interrupts off\n")
+    write_to_serial(ser, b"bootm start 0x2000000\n", sleep=0.2)
+    # time.sleep(0.2) # wait for "Booting using the fdt blob at" ...
+    write_to_serial(ser, b"bootm loados\n", sleep=2)
+    # time.sleep(2) # wait for "Uncompressing Kernel Image ... OK"
+    write_to_serial(ser, b"fdt resize\n", sleep=0.1)
+    # time.sleep(0.12)
+    write_to_serial(ser, b"fdt boardsetup\n", sleep=0.1)
+    write_to_serial(ser, b"fdt chosen\n", sleep=0.1)
+    write_to_serial(ser, b"bootm prep\n", sleep=0.1)
+    print("Starting TFTP Boot.")
+    write_to_serial(ser, b"bootm go\n", sleep=0.1)
+    max_retries = 2
+    cur_retries = 0
+    while ws_ap3710i.event_keep_serial_active.is_set():
+        line = readline_from_serial(ser)
+
+        if "Retry count exceeded" in line:  # TFTP boot failed
+            # https://github.com/u-boot/u-boot/blob/8c39999acb726ef083d3d5de12f20318ee0e5070/net/tftp.c#L704
+            logging.warning(f"Failed booting from TFTP (attempt #{cur_retries}): {line}")
+            cur_retries = cur_retries + 1
+            if cur_retries > max_retries:
+                write_to_serial(ser, b"\x03")
+                raise RuntimeError(f"Maximum TFTP retries {max_retries} reached. Aborting")
+
+        elif "Wrong Image Format for bootm command" in line:
+            # https://github.com/u-boot/u-boot/blob/8c39999acb726ef083d3d5de12f20318ee0e5070/boot/bootm.c#L974
+            # do not trigger any other condition, simply retyry when wrong image format was found
+            logging.error("TFTP boot found wrong image format")
+
+        elif "ERROR: can't get kernel image!" in line:
+            # https://github.com/u-boot/u-boot/blob/8c39999acb726ef083d3d5de12f20318ee0e5070/boot/bootm.c#L123
+            logging.error("Unable to boot initramfs file. Check you provided the correct file. Aborting.")
+            import os
+
+            # pylint: disable=protected-access
+            os._exit(1)
+
+        elif is_kernel_booting(line):
+            break
+
+        time.sleep(0.01)
+
+
+def start_tftp_boot_via_serial(
+    name: str,
+    tftp_ip: ipaddress.IPv4Interface | ipaddress.IPv6Interface,
+    tftp_file: str,
+    new_ap_ip: ipaddress.IPv4Interface | ipaddress.IPv6Interface,
+):
+    with serial.Serial(port=name, baudrate=115200, timeout=30) as ser:
+        logging.info(f"Starting to connect to serial port {ser.name}")
+        ws_ap3710i.event_keep_serial_active.set()
+
+        bootup_interrupt(ser)
+        bootup_login(ser)
+        bootup_login_verification(ser)
+        bootup_set_boot_openwrt(ser)
+        boot_via_tftp(ser, tftp_ip, tftp_file, new_ap_ip)
+        boot_wait_for_brlan(ser)
+        boot_set_ips(ser, new_ap_ip)
+        ws_ap3710i.event_ssh_ready.set()
+        keep_logging_until_reboot(ser)
+
+
+def main(
+    serial_port: str,
+    initramfs_path_str: str,
+    sysupgrade_path_str: str,
+    local_ip: str,
+    ap_ip: Optional[str] = None,
+    dryrun: bool = False,
+):
+    # TODO: improve DRYRUN
+    ws_ap3710i.DRYRUN = dryrun
+
+    ap_ip_interface, local_ip_interface = setting_up_ips(local_ip, ap_ip)
+
+    initramfs_path = pathlib.Path(initramfs_path_str)
+    sysupgrade_path = pathlib.Path(sysupgrade_path_str)
+
+    tftp_server = TftpServer(initramfs_path_str, listenip=str(local_ip_interface.ip))
+    tftp_server.start()
+    serial_thread = None
+    ssh_thread = None
+    try:
+        serial_thread = Thread(
+            target=start_tftp_boot_via_serial,
+            args=[serial_port, local_ip_interface, initramfs_path.name, ap_ip_interface],
+            daemon=True,
+        )
+        ssh_thread = Thread(target=start_ssh, args=[sysupgrade_path, str(ap_ip_interface.ip)])
+        logging.debug("Starting serial thread")
+        serial_thread.start()
+        logging.debug("Starting ssh thread")
+        ssh_thread.start()
+
+        logging.debug("Waiting for ssh thread")
+        # Strange workaround to allow ctrl+c or system stop events during a join()
+        while ssh_thread.is_alive():
+            ssh_thread.join(5)  # wait for SSH to conclude its actions
+
+        logging.debug("Waiting for serial thread")
+        # Strange workaround to allow ctrl+c or system stop events during a join()
+        while serial_thread.is_alive():
+            serial_thread.join(5)
+
+        logging.info("All steps finished. Give the AP some time to reboot and then access it on http://192.168.1.1")
+    except (KeyboardInterrupt, SystemExit, SystemError):
+        logging.warning("Aborting main process")
+    finally:
+        post_cleanup(tftp_server, ssh_thread, serial_thread)