athena: cleanup unused methods

old-commit-hash: ea94a6d89f

selfdrive/athena/athenad.py

@@ -11,7 +11,6 @@ import queue
 import random
 import select
 import socket
-import subprocess
 import sys
 import tempfile
 import threading
@@ -34,7 +33,7 @@ from openpilot.common.api import Api
 from openpilot.common.file_helpers import CallbackReader
 from openpilot.common.params import Params
 from openpilot.common.realtime import set_core_affinity
-from openpilot.system.hardware import HARDWARE, PC, AGNOS
+from openpilot.system.hardware import HARDWARE, PC
 from openpilot.system.loggerd.xattr_cache import getxattr, setxattr
 from openpilot.common.swaglog import cloudlog
 from openpilot.system.version import get_commit, get_origin, get_short_branch, get_version
@@ -360,22 +359,6 @@ def listDataDirectory(prefix='') -> List[str]:
   return scan_dir(Paths.log_root(), prefix)
 
 
-@dispatcher.add_method
-def reboot() -> Dict[str, int]:
-  sock = messaging.sub_sock("deviceState", timeout=1000)
-  ret = messaging.recv_one(sock)
-  if ret is None or ret.deviceState.started:
-    raise Exception("Reboot unavailable")
-
-  def do_reboot() -> None:
-    time.sleep(2)
-    HARDWARE.reboot()
-
-  threading.Thread(target=do_reboot).start()
-
-  return {"success": 1}
-
-
 @dispatcher.add_method
 def uploadFileToUrl(fn: str, url: str, headers: Dict[str, str]) -> UploadFilesToUrlResponse:
   # this is because mypy doesn't understand that the decorator doesn't change the return type
@@ -450,18 +433,6 @@ def cancelUpload(upload_id: Union[str, List[str]]) -> Dict[str, Union[int, str]]
   return {"success": 1}
 
 
-@dispatcher.add_method
-def setBandwithLimit(upload_speed_kbps: int, download_speed_kbps: int) -> Dict[str, Union[int, str]]:
-  if not AGNOS:
-    return {"success": 0, "error": "only supported on AGNOS"}
-
-  try:
-    HARDWARE.set_bandwidth_limit(upload_speed_kbps, download_speed_kbps)
-    return {"success": 1}
-  except subprocess.CalledProcessError as e:
-    return {"success": 0, "error": "failed to set limit", "stdout": e.stdout, "stderr": e.stderr}
-
-
 def startLocalProxy(global_end_event: threading.Event, remote_ws_uri: str, local_port: int) -> Dict[str, int]:
   try:
     if local_port not in LOCAL_PORT_WHITELIST:

system/hardware/tici/hardware.py

@@ -293,67 +293,6 @@ class Tici(HardwareBase):
 
     return super().get_network_metered(network_type)
 
-  @staticmethod
-  def set_bandwidth_limit(upload_speed_kbps: int, download_speed_kbps: int) -> None:
-    upload_speed_kbps = int(upload_speed_kbps)  # Ensure integer value
-    download_speed_kbps = int(download_speed_kbps)  # Ensure integer value
-
-    adapter = "wwan0"
-    ifb = "ifb0"
-
-    sudo = ["sudo"]
-    tc = sudo + ["tc"]
-
-    # check, cmd
-    cleanup = [
-      # Clean up old rules
-      (False, tc + ["qdisc", "del", "dev", adapter, "root"]),
-      (False, tc + ["qdisc", "del", "dev", ifb, "root"]),
-      (False, tc + ["qdisc", "del", "dev", adapter, "ingress"]),
-      (False, tc + ["qdisc", "del", "dev", ifb, "ingress"]),
-
-      # Bring ifb0 down
-      (False, sudo + ["ip", "link", "set", "dev", ifb, "down"]),
-    ]
-
-    upload = [
-      # Create root Hierarchy Token Bucket that sends all traffic to 1:20
-      (True, tc + ["qdisc", "add", "dev", adapter, "root", "handle", "1:", "htb", "default", "20"]),
-
-      # Create class 1:20 with specified rate limit
-      (True, tc + ["class", "add", "dev", adapter, "parent", "1:", "classid", "1:20", "htb", "rate", f"{upload_speed_kbps}kbit"]),
-
-      # Create universal 32 bit filter on adapter that sends all outbound ip traffic through the class
-      (True, tc + ["filter", "add", "dev", adapter, "parent", "1:", "protocol", "ip", "prio", \
-                   "10", "u32", "match", "ip", "dst", "0.0.0.0/0", "flowid", "1:20"]),
-    ]
-
-    download = [
-      # Bring ifb0 up
-      (True, sudo + ["ip", "link", "set", "dev", ifb, "up"]),
-
-      # Redirect ingress (incoming) to egress ifb0
-      (True, tc + ["qdisc", "add", "dev", adapter, "handle", "ffff:", "ingress"]),
-      (True, tc + ["filter", "add", "dev", adapter, "parent", "ffff:", "protocol", "ip", "u32", \
-                   "match", "u32", "0", "0", "action", "mirred", "egress", "redirect", "dev", ifb]),
-
-      # Add class and rules for virtual interface
-      (True, tc + ["qdisc", "add", "dev", ifb, "root", "handle", "2:", "htb"]),
-      (True, tc + ["class", "add", "dev", ifb, "parent", "2:", "classid", "2:1", "htb", "rate", f"{download_speed_kbps}kbit"]),
-
-      # Add filter to rule for IP address
-      (True, tc + ["filter", "add", "dev", ifb, "protocol", "ip", "parent", "2:", "prio", "1", "u32", "match", "ip", "src", "0.0.0.0/0", "flowid", "2:1"]),
-    ]
-
-    commands = cleanup
-    if upload_speed_kbps != -1:
-      commands += upload
-    if download_speed_kbps != -1:
-      commands += download
-
-    for check, cmd in commands:
-      subprocess.run(cmd, check=check)
-
   def get_modem_version(self):
     try:
       modem = self.get_modem()